[Kiwi-devel] [Git]Project kiwi at BerliOS branch, master, updated. 99f5c7176b9ce8afcd9f6af2f5a805de6a03d636

marcus_schaefer at BerliOS marcus_schaefer at mail.berlios.de
Wed Jun 30 13:24:19 CEST 2010


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Project kiwi at BerliOS".

The branch, master has been updated
       via  99f5c7176b9ce8afcd9f6af2f5a805de6a03d636 (commit)
       via  add7a65967a81d364e99637a893140bc88f6fcb6 (commit)
       via  45d8260be0b909ad873abfa88e864e2fa7d1e688 (commit)
       via  56e20a5bc1220539764f6fa5c67165c28ec9318e (commit)
       via  eae662b0e612070c2bf426086ea41e5312133e85 (commit)
      from  4a3ae8578dfdd07610a672912e78dc7bca43af0a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 99f5c7176b9ce8afcd9f6af2f5a805de6a03d636
Author: Marcus Schäfer <ms at novell.com>
Date:   Wed Jun 30 13:08:00 2010 +0200

    - added changelog entry for new KIWIImageFormat module

commit add7a65967a81d364e99637a893140bc88f6fcb6
Author: Marcus Schäfer <ms at novell.com>
Date:   Wed Jun 30 11:20:49 2010 +0200

    - update image descriptions via xslt

commit 45d8260be0b909ad873abfa88e864e2fa7d1e688
Author: Marcus Schäfer <ms at novell.com>
Date:   Wed Jun 30 11:14:18 2010 +0200

    - added xslt stylesheet to convert from schema v4.6 to v4.7
      the conversion moves the vmwareconfig and xenconfig sections
      into the common machine sections and also changes
      format="iso" into installiso="true" and format="usb" into
      installstick="true"

commit 56e20a5bc1220539764f6fa5c67165c28ec9318e
Author: Marcus Schäfer <ms at novell.com>
Date:   Wed Jun 30 10:53:36 2010 +0200

    - update documentation according to the new KIWIImageFormat
      module and the changes in the type and VM configuration
      XML setup

commit eae662b0e612070c2bf426086ea41e5312133e85
Author: Marcus Schäfer <ms at novell.com>
Date:   Tue Jun 29 08:01:56 2010 +0200

    - Cleanup formats in kiwi:
      * create new KIWIImageFormat.pm module for the conversion
        into different image formats like vmdk,ovf and friends.
        Also added function for creating the machine configuration
        into this new module
      * create common XML specification for vmware|xen config
        starting with <machine>
      * added new option --convert to kiwi.
      * recursively call kiwi with $main::Convert set to convert
        into the specified format and/or configuration
      * added bool attributes installcd and installstick replacing
        the old format="iso" and format="usb" setup

-----------------------------------------------------------------------

Summary of changes:
diff --git a/doc/LaTex/description.tex b/doc/LaTex/description.tex
index cd30e95..3975777 100644
--- a/doc/LaTex/description.tex
+++ b/doc/LaTex/description.tex
@@ -192,7 +192,7 @@ assumed to be present for all profiles.
 \hspace*{1cm}<packagemanager>smart</packagemanager>\\
 \hspace*{1cm}<type image="name" ...>\\
 \hspace*{2cm}<ec2config|lvmvolumes|oemconfig|\\
-\hspace*{2cm} pxedeploy|size|split|vmwareconfig|xenconfig>\\
+\hspace*{2cm} pxedeploy|size|split|machine>\\
 \hspace*{1cm}</type>\\
 </preferences>
 \end{Command}
@@ -348,13 +348,13 @@ values of the image attribute:
       the rules indicated for the USB system. Last but not least
       the virtual disk system may also be created with a LVM based layout by
       using the \textbf{lvm} attribute. The previously indicated rules apply.
-      Use the \textbf{vmwareconfig} or \textbf{xenconfig} child elements
+      Use the \textbf{machine} child element
       to specify appropriate configuration of the virtual disk system.
 \item \textbf{image=''xen''}\\
       Use this type to create a Xen para-virtual guest image. The
       \textbf{filesystem} and \textbf{boot=''xenboot/suse-*''} attributes
       specify the filesystem type used and select the proper boot image,
-      respectively. Use the \textbf{xenconfig} child element to specify
+      respectively. Use the \textbf{machine} child element to specify
       configuration options of the Xen guest image.
 \end{itemize}
 
@@ -704,35 +704,33 @@ supported child elements:
     Use the \textbf{except} element to specify exceptions to previously
     configured rules.
 
-\item \textbf{vmwareconfig}\\
-    The optional vmwareconfig section serves to specify information
-    about a VMware guest image. Information provided in this block is only
-    considered if the image description contains a \textbf{packages} block
-    with the \textbf{type} attribute set to \textbf{vmware}.
+\item \textbf{machine}\\
+    The optional machine section serves to specify information
+    about a VM guest machine. Using the data provided in this section,
+    Kiwi will create a guest configuration file required to run the
+    image on the target machine.
 
-    Using the data provided in this section, Kiwi will create a guest
-    configuration file required to run the image using the VMware tools.
-    It is possible to create the guest configuration file with the VMware
-    tools. However, taking advantage of Kiwi's functionality to generate
-    the guest configuration file alows the delivery of one bundle that is
-    ready to run on VMware infrastructure.
+    If the target is a VMware virtual machine indicated by the
+    format attribute set to vmdk, kiwi creates a VMware config file.
+    If the target is a Xen virtual machine indicated by the domain
+    attribute in the machine section kiwi will create a Xen guest
+    config file.
 
     The sample block below shows the general outline of the information
-    that can be specified to generate the (.vmx) configuration file for
-    VMware:
+    that can be specified to generate the configuration file
 
 	\begin{Command}{12cm}
-	<vmwareconfig arch="arch" memory="MB"\\
+	<machine arch="arch" memory="MB"\\
 	\hspace*{2.5cm}HWversion="number"\\
 	\hspace*{2.5cm}guestOS="suse|sles"\\
-	\hspace*{2.5cm}usb="true|false"/>\\
-	\hspace*{1cm}<vmwarenic driver="name"\\
+	\hspace*{2.5cm}domain="dom0|domU"/>\\
+	\hspace*{1cm}<vmnic driver="name"\\
 	\hspace*{2.5cm}interface="number" mode="mode"/>\\
-	\hspace*{1cm}<vmwaredisk controller="ide|scsi"\\
+	\hspace*{1cm}<vmdisk controller="ide|scsi"\\
 	\hspace*{2.5cm}id="number"/>\\
-	\hspace*{1cm}<vmwarecdrom controller="ide|scsi"\\
+	\hspace*{1cm}<vmdvd controller="ide|scsi"\\
 	\hspace*{2.5cm}id="number"/>\\
-	</vmwareconfig>
+	</machine>
 	\end{Command}
 
 	\begin{itemize}
@@ -749,12 +747,15 @@ supported child elements:
       value is \textbf{suse} and for the x86\_64 architecture
       \textbf{suse-64} is the default. At this point only the SUSE and
       SLES guestOS types are supported.
-	\item \textbf{usb}\\
-      The bool value \textbf{usb} specifies whether the guest machine
-      should provide a virtual USB controller or not.
+	\item \textbf{domain}\\
+      The Xen domain setup. This could be either a dom0 which is the
+      host machine hosting the guests and therefore doesn't require a
+      configuration file, or it could be set to domU which indicates
+      this is a guest and also requires a guest configuration which is
+      created by kiwi
 	\end{itemize}
 
-	The following information can be provided to setup the VMware virtual
+	The following information can be provided to setup the virtual
 	main storage device and CD/DVD drive connection.
 
 	\begin{itemize}
@@ -763,10 +764,13 @@ supported child elements:
       and \textbf{scsi}.
 	\item \textbf{id}\\
       The mandatory id attribute specifies the disk id. If only one
-      disk is set the id value should be set to 0. 
+      disk is set the id value should be set to 0.
+	\item \textbf{device}\\
+      The device attribute specifies the disk that should appear
+      in the para virtual instance. Therefore only relevant for Xen
 	\end{itemize}
 
-	The following information can be provided to setup the VMware virtual
+	The following information can be provided to setup the virtual
 	network interface
 
 	\begin{itemize}
@@ -782,70 +786,6 @@ supported child elements:
       The network mode used to communicate outside the VM. In many cases
       the bridged mode is used.
 	\end{itemize}
-
-\item \textbf{xenconfig}\\
-    The optional xenconfig section serves to specify information
-    about a Xen guest image. Information provided in this block is only
-    considered if the image description contains a \textbf{packages} block
-    with the \textbf{type} attribute set to \textbf{xen}.
-
-    Using the data provided in this section, Kiwi will create a guest
-    configuration file required to run the image using the Xen tools.
-    This provides the capability of delivering one bundle that is ready
-    to run on Xen infrastructure.
-
-    The sample block below shows the general outline of the information
-    that can be specified to generate the (.xenconfig) configuration file for
-    Xen:
-
-	\begin{Command}{12cm}
-	<xenconfig memory="MB"\\
-	\hspace*{1cm}<xendisk device="/dev/..."/>\\
-	\hspace*{1cm}<xenbridge name="eth0" mac="addr"/>\\
-	</vmwareconfig>
-	\end{Command}
-
-	\begin{itemize}
-	\item \textbf{memory}\\
-      The mandatory memory attribute specifies how much memory in MB
-      should be allocated for the guest machine    
-	\end{itemize}
-
-	The following information can be provided to setup the Xen para virtual
-	main storage device as part of a \textbf{xendisk} element.
-
-	\begin{itemize}
-	\item \textbf{device}\\
-      The mandatory device attribute specifies the disk that should appear
-      in the para virtual instance.
-	\end{itemize}
-
-	The default Xen configuration uses bridging within domain 0 to allow all
-	domains to appear on the network as individual hosts. In order to create
-	the bridge which can be used by the Xen virtual network interface(s) the
-	script ''/etc/xen/scripts/network-bridge start'' can be called to create
-	a bridge as shown in the following picture:
-
-	\begin{figure}[h]
-	\centering
-	\includegraphics[scale=0.5]{pictures/xenbridge.eps}
-	\caption{Illustration on network-bridge and vif-bridge}
-	\label{fig:architecture}
-	\end{figure}
-
-	Additional information about Xen networking configuration can be
-	found here: \url{http://wiki.xensource.com/xenwiki/XenNetworking}
-	The following information can be provided to setup the Xen network
-	bridge as part of one ore more \textbf{xenbridge} elements..
-
-	\begin{itemize}
-	\item \textbf{name}\\
-      The name of the network interface which is the bridge between
-      the physical device (peth) and the virtual device(s) (vif).
-	\item \textbf{mac}\\
-      The optional mac attribute specifies the MAC address for the virtual
-      interface inside the DOM(x).
-	\end{itemize}
 \end{itemize}
 
 \subsection{users element}
diff --git a/doc/LaTex/oem.tex b/doc/LaTex/oem.tex
index eb63393..6ee5e15 100644
--- a/doc/LaTex/oem.tex
+++ b/doc/LaTex/oem.tex
@@ -21,10 +21,10 @@ The OEM example provided with kiwi is based on recent openSUSE releases,
 one example configuration per release, and includes the default and x11 
 patterns. The image type is a split type utilizing the distributions default
 filesystem format for the read-write partition and the squashfs filesystem 
-for the read-only partition. Using the additional \textbf{format} attribute 
-with the \textbf{iso} value creates an installable ISO image. When booting 
-from the ISO image the OEM disk image will be deployed to the storage media
-on the booting machine (after confirmation by the user).
+for the read-only partition. Using the additional \textbf{installiso} attribute 
+creates an installable ISO image. When booting from the ISO image the
+OEM disk image will be deployed to the storage media on the booting machine
+(after confirmation by the user).
 
 The commands provided below use the openSUSE 11.2 based example built 
 for the x86 architecture.
@@ -98,21 +98,22 @@ qemu -hda /tmp/mydisk -cdrom \
 
 \section{Flavors}
 
-As indicated above the use of the \textbf{format} attribute for the
-oem image supports the creation of an installation image. The installation 
-image can be created in two formats, one suitable for CD/DVD media and a 
-second suitable for a USB stick. The self installing image deploys the oem
-image onto the selected storage device. The installation process is a 
-simple image dump using the dd command. During this process the target system
+As indicated above the use of the \textbf{installiso} and \textbf{installstick}
+ attributes for the oem image supports the creation of an installation image.
+The installation image can be created in two formats, one suitable for
+CD/DVD media and a second suitable for a USB stick. The self installing
+image deploys the oem image onto the selected storage device. The
+installation process is a simple image dump using the dd command. During
+this process the target system
 remains in terminal mode. The following configuration snippets show the 
-use of the \textbf{format} attribute to create the ISO or USB installation
-image format respectively.
+use of the \textbf{installiso} and \textbf{installstick} attributes
+to create the ISO or USB installation image format respectively.
 
 \begin{itemize}
-\item <type image="name" ... format=''iso''/>\\
+\item <type image="name" ... installiso=''true''/>\\
       Creates a .iso file which can be burned in CD or DVD. This
       represents an installation CD
-\item <type image="name" ... format=''usb''/>\\
+\item <type image="name" ... installstick=''true''/>\\
       Creates a .raw.install file which can be dumped (dd) on a
       USB stick. This represents an installation Stick
 \end{itemize}
diff --git a/doc/LaTex/pxe.tex b/doc/LaTex/pxe.tex
index b0e4268..b6aa305 100644
--- a/doc/LaTex/pxe.tex
+++ b/doc/LaTex/pxe.tex
@@ -538,16 +538,23 @@ them together. Below find an example:
 
 \begin{itemize}
 \item add a split type in config.xml, for example\\
-      \textbf{<type fsreadonly=''squashfs'' fsreadwrite=''ext3''
-      boot=''netboot/suse-11.2''>split</type>}
-\item add a split section to describe the writable portion,
-      for example:
+      \textbf{<type image="split" fsreadonly=''squashfs'' fsreadwrite=''ext3''
+      boot=''netboot/suse-11.2''/>}
+\item add a split section inside the type to describe the temporary
+      and persistent parts. For example:
 \begin{verbatim}
 <split>
+   <temporary>
+      <!-- allow RAM read/write access to: -->
+      <file name="/mnt"/>
+      <file name="/mnt/*"/>
+   </temporary>
    <persistent>
-      <!-- allow read/write access to: -->
+      <!-- allow DISK read/write access to: -->
       <file name="/var"/>
       <file name="/var/*"/>
+      <file name="/boot"/>
+      <file name="/boot/*"/>
       <file name="/etc"/>
       <file name="/etc/*"/>
       <file name="/home"/>
diff --git a/doc/LaTex/vmx.tex b/doc/LaTex/vmx.tex
index 93d6a41..44b2f38 100644
--- a/doc/LaTex/vmx.tex
+++ b/doc/LaTex/vmx.tex
@@ -70,16 +70,9 @@ The following table lists the supported virtual disk formats
 \hline
 \textbf{Name} & \textbf{Description} \\
 \hline
-vvfat       & Disk format DOS FAT32 \\
-vpc         & Virtual PC read only disk  \\
-bochs       & Disk format for Bochs emulator  \\
-dmg         & Disk format for Mac OS X \\
-cloop       & Compressed loop \\
 vmdk        & Disk format for VMware \\
 ovf         & Open Virtual Format requires VMwares ovftool \\
 qcow2       & QEMU virtual disk format  \\
-qcow        & QEMU virtual disk format  \\
-cow         & QEMU virtual disk format \\
 \hline
 \end{tabular}
 
@@ -101,9 +94,9 @@ config.xml snippet provides general guidance on the elements in config.xml.
    <!-- packages you need in VMware only -->
 </packages>
 <type......>
-   <vmwareconfig memory="512">
-      <vmwaredisk controller="ide" id="0"/>
-   </vmwareconfig>
+   <machine memory="512">
+      <vmdisk controller="ide" id="0"/>
+   </machine>
 </type>
 \end{verbatim}
 \end{Command}
@@ -112,7 +105,7 @@ Given the specification above Kiwi will create a VMware guest
 configuration specifying the availability of 512 MB of RAM and an IDE 
 disk controller interface for the VM guest. For aditional information
 about the configuration settings please refere to the 
-\textbf{vmwareconfig} section. 
+\textbf{machine} section. 
 
 The guest configuration can be loaded through VMware user interface and 
 may be modified through the GUI. The configuration file has the .vmx 
diff --git a/doc/LaTex/xen.tex b/doc/LaTex/xen.tex
index 62d4109..9796762 100644
--- a/doc/LaTex/xen.tex
+++ b/doc/LaTex/xen.tex
@@ -71,9 +71,9 @@ need in this para virtual environment.
    <package name="xen"/>
 </packages>
 <type ....>
-   <xenconfig memory="512" domain="domU">
-      <xendisk device="/dev/sda"/>
-   </xenconfig>
+   <machine memory="512" domain="domU">
+      <vmdisk device="/dev/sda"/>
+   </machine>
 </type>
 \end{verbatim}
 \end{Command}
@@ -82,7 +82,7 @@ If this information is present KIWI will create a Xen domain U
 (or domain 0)
 configuration with 512 MB of RAM and expects the disk at /dev/sda.
 Additional information to setup the Xen guest machine properties are
-explained in the \textbf{xenconfig} section. The KIWI Xen domain U
+explained in the \textbf{machine} section. The KIWI Xen domain U
 configuration is stored in the file:
 
 \begin{Command}{13cm}
diff --git a/doc/examples/suse-11.1/suse-ec2-guest/config.xml b/doc/examples/suse-11.1/suse-ec2-guest/config.xml
index 99693a7..e914e78 100644
--- a/doc/examples/suse-11.1/suse-ec2-guest/config.xml
+++ b/doc/examples/suse-11.1/suse-ec2-guest/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.1-ec2-guest">
+<image schemaversion="4.7" name="suse-11.1-ec2-guest">
 	<description type="system">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
@@ -15,14 +15,14 @@
 			</ec2config>
 		</type>
 		<type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.1">
-			<vmwareconfig memory="512">
-				<vmwaredisk controller="ide" id="0"/>
-			</vmwareconfig>
+			<machine memory="512">
+				<vmdisk controller="ide" id="0"/>
+			</machine>
 		</type>
 		<type image="xen" filesystem="ext3" boot="xenboot/suse-11.1">
-			<xenconfig memory="512">
-				<xendisk device="/dev/sda"/>
-			</xenconfig>
+			<machine memory="512">
+				<vmdisk controller="ide" id="0" device="/dev/sda"/>
+			</machine>
 		</type>
 		<version>1.1.2</version>
 		<packagemanager>zypper</packagemanager>
diff --git a/doc/examples/suse-11.1/suse-euca-cloud/cloud-cloud-node/config.xml b/doc/examples/suse-11.1/suse-euca-cloud/cloud-cloud-node/config.xml
index 19fa2e2..2e5e04e 100644
--- a/doc/examples/suse-11.1/suse-euca-cloud/cloud-cloud-node/config.xml
+++ b/doc/examples/suse-11.1/suse-euca-cloud/cloud-cloud-node/config.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="Eucalyptus-Cloud-Node">
+<image schemaversion="4.7" name="Eucalyptus-Cloud-Node">
 	<description type="system">
 		<author>Robert Schweikert</author>
 		<contact>rschweikert at novell.com</contact>
 		<specification>openSUSE 11.1 Eucalyptus Cloud Node</specification>
 	</description>
 	<preferences>
-		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.1" format="iso" bootprofile="xen" bootkernel="xenk">
+		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.1" bootprofile="xen" bootkernel="xenk" installiso="true">
 			<oemconfig>
 				<oem-boot-title>Eucalyptus Cloud Node</oem-boot-title>
 <!-- Do not create an extra partition -->
@@ -17,7 +17,7 @@
 				<oem-swap>true</oem-swap>
 				<oem-swapsize>1024</oem-swapsize>
 			</oemconfig>
-			<xenconfig domain="dom0"/>
+			<machine domain="dom0"/>
 		</type>
 		<version>1.0.0</version>
 		<packagemanager>zypper</packagemanager>
diff --git a/doc/examples/suse-11.1/suse-euca-cloud/cloud-head-node/config.xml b/doc/examples/suse-11.1/suse-euca-cloud/cloud-head-node/config.xml
index 356209b..106e9a6 100644
--- a/doc/examples/suse-11.1/suse-euca-cloud/cloud-head-node/config.xml
+++ b/doc/examples/suse-11.1/suse-euca-cloud/cloud-head-node/config.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="Eucalyptus-Head-Node">
+<image schemaversion="4.7" name="Eucalyptus-Head-Node">
 	<description type="system">
 		<author>Robert Schweikert</author>
 		<contact>rschweikert at novell.com</contact>
 		<specification>openSUSE 11.1 based Eucalyptus Head Node</specification>
 	</description>
 	<preferences>
-		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.1" format="iso">
+		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.1" installiso="true">
 			<oemconfig>
 				<oem-boot-title>Eucalyptus Head Node</oem-boot-title>
 <!-- Do no create an extra partition -->
diff --git a/doc/examples/suse-11.1/suse-live-iso/config.xml b/doc/examples/suse-11.1/suse-live-iso/config.xml
index 370ec6a..fcc3e99 100644
--- a/doc/examples/suse-11.1/suse-live-iso/config.xml
+++ b/doc/examples/suse-11.1/suse-live-iso/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.1-live-iso">
+<image schemaversion="4.7" name="suse-11.1-live-iso">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
diff --git a/doc/examples/suse-11.1/suse-live-stick/config.xml b/doc/examples/suse-11.1/suse-live-stick/config.xml
index 6b3b1e6..e4bafc1 100644
--- a/doc/examples/suse-11.1/suse-live-stick/config.xml
+++ b/doc/examples/suse-11.1/suse-live-stick/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.1-live-stick">
+<image schemaversion="4.7" name="suse-11.1-live-stick">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
diff --git a/doc/examples/suse-11.1/suse-min-gnome/config.xml b/doc/examples/suse-11.1/suse-min-gnome/config.xml
index fdb93f3..00e51e6 100644
--- a/doc/examples/suse-11.1/suse-min-gnome/config.xml
+++ b/doc/examples/suse-11.1/suse-min-gnome/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.1-gnome-demo">
+<image schemaversion="4.7" name="suse-11.1-gnome-demo">
 	<description type="system">
 		<author>Robert Schweikert</author>
 		<contact>rschweikert at novell.</contact>
@@ -8,9 +8,9 @@
 	</description>
 	<preferences>
 		<type image="vmx" primary="true" filesystem="ext3" boot="vmxboot/suse-11.1" format="vmdk">
-			<vmwareconfig memory="1024">
-				<vmwaredisk controller="ide" id="0"/>
-			</vmwareconfig>
+			<machine memory="1024">
+				<vmdisk controller="ide" id="0"/>
+			</machine>
 		</type>
 		<type image="iso" boot="isoboot/suse-11.1" flags="unified"/>
 		<version>1.0.1</version>
diff --git a/doc/examples/suse-11.1/suse-oem-preload/config.xml b/doc/examples/suse-11.1/suse-oem-preload/config.xml
index e01cd93..5c1a8ae 100644
--- a/doc/examples/suse-11.1/suse-oem-preload/config.xml
+++ b/doc/examples/suse-11.1/suse-oem-preload/config.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.1-oem-preload">
+<image schemaversion="4.7" name="suse-11.1-oem-preload">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
 		<specification>openSUSE 11.1 oem preload system</specification>
 	</description>
 	<preferences>
-		<type image="split" fsreadwrite="ext3" fsreadonly="squashfs" boot="oemboot/suse-11.1" format="iso">
+		<type image="split" fsreadwrite="ext3" fsreadonly="squashfs" boot="oemboot/suse-11.1" installiso="true">
 			<split>
 				<persistent>
 					<file name="/etc"/>
diff --git a/doc/examples/suse-11.1/suse-pxe-client/config.xml b/doc/examples/suse-11.1/suse-pxe-client/config.xml
index e671d8f..79f20a9 100644
--- a/doc/examples/suse-11.1/suse-pxe-client/config.xml
+++ b/doc/examples/suse-11.1/suse-pxe-client/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.1-pxe-client">
+<image schemaversion="4.7" name="suse-11.1-pxe-client">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
diff --git a/doc/examples/suse-11.1/suse-vm-guest/config.xml b/doc/examples/suse-11.1/suse-vm-guest/config.xml
index 8439135..22cff20 100644
--- a/doc/examples/suse-11.1/suse-vm-guest/config.xml
+++ b/doc/examples/suse-11.1/suse-vm-guest/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.1-vm-guest">
+<image schemaversion="4.7" name="suse-11.1-vm-guest">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
@@ -8,9 +8,9 @@
 	</description>
 	<preferences>
 		<type image="vmx" primary="true" filesystem="ext3" boot="vmxboot/suse-11.1" format="vmdk">
-			<vmwareconfig memory="512">
-				<vmwaredisk controller="ide" id="0"/>
-			</vmwareconfig>
+			<machine memory="512">
+				<vmdisk controller="ide" id="0"/>
+			</machine>
 		</type>
 		<version>1.1.2</version>
 		<packagemanager>zypper</packagemanager>
diff --git a/doc/examples/suse-11.1/suse-xen-guest/config.xml b/doc/examples/suse-11.1/suse-xen-guest/config.xml
index 0b44e61..910df0f 100644
--- a/doc/examples/suse-11.1/suse-xen-guest/config.xml
+++ b/doc/examples/suse-11.1/suse-xen-guest/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.1-xen-guest">
+<image schemaversion="4.7" name="suse-11.1-xen-guest">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
@@ -8,10 +8,10 @@
 	</description>
 	<preferences>
 		<type image="xen" filesystem="ext3" boot="xenboot/suse-11.1">
-			<xenconfig memory="128">
-				<xendisk device="/dev/sda"/>
-				<xenbridge mac="00:0C:6E:AA:57:2F" name="br0"/>
-			</xenconfig>
+			<machine memory="128">
+				<vmdisk controller="ide" id="0" device="/dev/sda"/>
+				<vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/>
+			</machine>
 		</type>
 		<version>1.1.2</version>
 		<packagemanager>zypper</packagemanager>
diff --git a/doc/examples/suse-11.2/suse-ec2-guest/config.xml b/doc/examples/suse-11.2/suse-ec2-guest/config.xml
index 6cdbe2e..913db6b 100644
--- a/doc/examples/suse-11.2/suse-ec2-guest/config.xml
+++ b/doc/examples/suse-11.2/suse-ec2-guest/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.2-ec2-guest">
+<image schemaversion="4.7" name="suse-11.2-ec2-guest">
 	<description type="system">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
@@ -15,14 +15,14 @@
 			</ec2config>
 		</type>
 		<type image="vmx" filesystem="ext4" boot="vmxboot/suse-11.2">
-			<vmwareconfig memory="512">
-				<vmwaredisk controller="ide" id="0"/>
-			</vmwareconfig>
+			<machine memory="512">
+				<vmdisk controller="ide" id="0"/>
+			</machine>
 		</type>
 		<type image="xen" filesystem="ext4" boot="xenboot/suse-11.2">
-			<xenconfig memory="512">
-				<xendisk device="/dev/sda"/>
-			</xenconfig>
+			<machine memory="512">
+				<vmdisk controller="ide" id="0" device="/dev/sda"/>
+			</machine>
 		</type>
 		<version>1.1.2</version>
 		<packagemanager>zypper</packagemanager>
diff --git a/doc/examples/suse-11.2/suse-euca-cloud/cloud-cloud-node/config.xml b/doc/examples/suse-11.2/suse-euca-cloud/cloud-cloud-node/config.xml
index e31649b..c5caf6a 100644
--- a/doc/examples/suse-11.2/suse-euca-cloud/cloud-cloud-node/config.xml
+++ b/doc/examples/suse-11.2/suse-euca-cloud/cloud-cloud-node/config.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="Eucalyptus-Cloud-Node">
+<image schemaversion="4.7" name="Eucalyptus-Cloud-Node">
 	<description type="system">
 		<author>Robert Schweikert</author>
 		<contact>rschweikert at novell.com</contact>
 		<specification>openSUSE 11.2 Eucalyptus Cloud Node</specification>
 	</description>
 	<preferences>
-		<type image="oem" filesystem="ext4" boot="oemboot/suse-11.2" format="iso" bootprofile="xen" bootkernel="xenk">
+		<type image="oem" filesystem="ext4" boot="oemboot/suse-11.2" bootprofile="xen" bootkernel="xenk" installiso="true">
 			<oemconfig>
 				<oem-boot-title>Eucalyptus Cloud Node</oem-boot-title>
 <!-- Do not create an extra partition -->
@@ -17,7 +17,7 @@
 				<oem-swap>true</oem-swap>
 				<oem-swapsize>1024</oem-swapsize>
 			</oemconfig>
-			<xenconfig domain="dom0"/>
+			<machine domain="dom0"/>
 		</type>
 		<version>1.0.0</version>
 		<packagemanager>zypper</packagemanager>
diff --git a/doc/examples/suse-11.2/suse-euca-cloud/cloud-head-node/config.xml b/doc/examples/suse-11.2/suse-euca-cloud/cloud-head-node/config.xml
index d245c2b..50ebf3b 100644
--- a/doc/examples/suse-11.2/suse-euca-cloud/cloud-head-node/config.xml
+++ b/doc/examples/suse-11.2/suse-euca-cloud/cloud-head-node/config.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="Eucalyptus-Head-Node">
+<image schemaversion="4.7" name="Eucalyptus-Head-Node">
 	<description type="system">
 		<author>Robert Schweikert</author>
 		<contact>rschweikert at novell.com</contact>
 		<specification>openSUSE 11.2 based Eucalyptus Head Node</specification>
 	</description>
 	<preferences>
-		<type image="oem" filesystem="ext4" boot="oemboot/suse-11.2" format="iso">
+		<type image="oem" filesystem="ext4" boot="oemboot/suse-11.2" installiso="true">
 			<oemconfig>
 				<oem-boot-title>Eucalyptus Head Node</oem-boot-title>
 <!-- Do no create an extra partition -->
diff --git a/doc/examples/suse-11.2/suse-live-iso/config.xml b/doc/examples/suse-11.2/suse-live-iso/config.xml
index 91cfca2..c288c2a 100644
--- a/doc/examples/suse-11.2/suse-live-iso/config.xml
+++ b/doc/examples/suse-11.2/suse-live-iso/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.2-live-iso">
+<image schemaversion="4.7" name="suse-11.2-live-iso">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
diff --git a/doc/examples/suse-11.2/suse-live-stick/config.xml b/doc/examples/suse-11.2/suse-live-stick/config.xml
index 835bb9d..742ab5d 100644
--- a/doc/examples/suse-11.2/suse-live-stick/config.xml
+++ b/doc/examples/suse-11.2/suse-live-stick/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.2-live-stick">
+<image schemaversion="4.7" name="suse-11.2-live-stick">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
diff --git a/doc/examples/suse-11.2/suse-min-gnome/config.xml b/doc/examples/suse-11.2/suse-min-gnome/config.xml
index 4a44388..585c839 100644
--- a/doc/examples/suse-11.2/suse-min-gnome/config.xml
+++ b/doc/examples/suse-11.2/suse-min-gnome/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.2-gnome-demo">
+<image schemaversion="4.7" name="suse-11.2-gnome-demo">
 	<description type="system">
 		<author>Robert Schweikert</author>
 		<contact>rschweikert at novell.</contact>
@@ -8,9 +8,9 @@
 	</description>
 	<preferences>
 		<type image="vmx" primary="true" filesystem="ext3" boot="vmxboot/suse-11.2" format="vmdk">
-			<vmwareconfig memory="1024">
-				<vmwaredisk controller="ide" id="0"/>
-			</vmwareconfig>
+			<machine memory="1024">
+				<vmdisk controller="ide" id="0"/>
+			</machine>
 		</type>
 		<type image="iso" boot="isoboot/suse-11.2" flags="unified"/>
 		<version>1.0.1</version>
diff --git a/doc/examples/suse-11.2/suse-oem-preload/config.xml b/doc/examples/suse-11.2/suse-oem-preload/config.xml
index 12763ca..6588f3d 100644
--- a/doc/examples/suse-11.2/suse-oem-preload/config.xml
+++ b/doc/examples/suse-11.2/suse-oem-preload/config.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.2-oem-preload">
+<image schemaversion="4.7" name="suse-11.2-oem-preload">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
 		<specification>openSUSE 11.2 oem preload system</specification>
 	</description>
 	<preferences>
-		<type image="split" fsreadwrite="ext4" fsreadonly="squashfs" boot="oemboot/suse-11.2" format="iso">
+		<type image="split" fsreadwrite="ext4" fsreadonly="squashfs" boot="oemboot/suse-11.2" installiso="true">
 			<split>
 				<persistent>
 					<file name="/etc"/>
diff --git a/doc/examples/suse-11.2/suse-pxe-client/config.xml b/doc/examples/suse-11.2/suse-pxe-client/config.xml
index c2196f7..2365816 100644
--- a/doc/examples/suse-11.2/suse-pxe-client/config.xml
+++ b/doc/examples/suse-11.2/suse-pxe-client/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.2-pxe-client">
+<image schemaversion="4.7" name="suse-11.2-pxe-client">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
diff --git a/doc/examples/suse-11.2/suse-vm-guest/config.xml b/doc/examples/suse-11.2/suse-vm-guest/config.xml
index 7b433dc..f98f08a 100644
--- a/doc/examples/suse-11.2/suse-vm-guest/config.xml
+++ b/doc/examples/suse-11.2/suse-vm-guest/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.2-vm-guest">
+<image schemaversion="4.7" name="suse-11.2-vm-guest">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
@@ -8,9 +8,9 @@
 	</description>
 	<preferences>
 		<type image="vmx" primary="true" filesystem="ext4" boot="vmxboot/suse-11.2" format="vmdk">
-			<vmwareconfig memory="512">
-				<vmwaredisk controller="ide" id="0"/>
-			</vmwareconfig>
+			<machine memory="512">
+				<vmdisk controller="ide" id="0"/>
+			</machine>
 		</type>
 		<version>1.1.2</version>
 		<packagemanager>zypper</packagemanager>
diff --git a/doc/examples/suse-11.2/suse-xen-guest/config.xml b/doc/examples/suse-11.2/suse-xen-guest/config.xml
index e30a11e..e565179 100644
--- a/doc/examples/suse-11.2/suse-xen-guest/config.xml
+++ b/doc/examples/suse-11.2/suse-xen-guest/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.2-xen-guest">
+<image schemaversion="4.7" name="suse-11.2-xen-guest">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
@@ -8,10 +8,10 @@
 	</description>
 	<preferences>
 		<type image="xen" filesystem="ext4" boot="xenboot/suse-11.2">
-			<xenconfig memory="128">
-				<xendisk device="/dev/sda"/>
-				<xenbridge mac="00:0C:6E:AA:57:2F" name="br0"/>
-			</xenconfig>
+			<machine memory="128">
+				<vmdisk controller="ide" id="0" device="/dev/sda"/>
+				<vmnic interface="br0" mac="00:0C:6E:AA:57:2F"/>
+			</machine>
 		</type>
 		<version>1.1.2</version>
 		<packagemanager>zypper</packagemanager>
diff --git a/doc/examples/suse-11.3/suse-live-iso/config.xml b/doc/examples/suse-11.3/suse-live-iso/config.xml
index e2b4715..9265311 100644
--- a/doc/examples/suse-11.3/suse-live-iso/config.xml
+++ b/doc/examples/suse-11.3/suse-live-iso/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.3-live-iso">
+<image schemaversion="4.7" name="suse-11.3-live-iso">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
diff --git a/doc/examples/suse-11.3/suse-min-gnome/config.xml b/doc/examples/suse-11.3/suse-min-gnome/config.xml
index 6a97345..57f9bf0 100644
--- a/doc/examples/suse-11.3/suse-min-gnome/config.xml
+++ b/doc/examples/suse-11.3/suse-min-gnome/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="4.6" name="suse-11.3-gnome-demo">
+
+<image schemaversion="4.7" name="suse-11.3-gnome-demo">
 	<description type="system">
 		<author>Robert Schweikert</author>
 		<contact>rschweikert at novell.</contact>
@@ -7,9 +8,9 @@
 	</description>
 	<preferences>
 		<type image="vmx" primary="true" filesystem="ext4" boot="vmxboot/suse-11.3" format="vmdk">
-			<vmwareconfig memory="1024">
-				<vmwaredisk controller="ide" id="0"/>
-			</vmwareconfig>
+			<machine memory="1024">
+				<vmdisk controller="ide" id="0"/>
+			</machine>
 		</type>
 		<type image="iso" boot="isoboot/suse-11.3" flags="unified"/>
 		<version>1.0.1</version>
diff --git a/doc/examples/suse-11.3/suse-oem-preload/config.xml b/doc/examples/suse-11.3/suse-oem-preload/config.xml
index 7b26a62..302efae 100644
--- a/doc/examples/suse-11.3/suse-oem-preload/config.xml
+++ b/doc/examples/suse-11.3/suse-oem-preload/config.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.3-oem-preload">
+<image schemaversion="4.7" name="suse-11.3-oem-preload">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
 		<specification>openSUSE 11.3 oem preload system</specification>
 	</description>
 	<preferences>
-		<type image="split" fsreadwrite="ext4" fsreadonly="squashfs" boot="oemboot/suse-11.3" format="iso">
+		<type image="split" fsreadwrite="ext4" fsreadonly="squashfs" boot="oemboot/suse-11.3" installiso="true">
 			<split>
 				<persistent>
 					<file name="/etc"/>
diff --git a/doc/examples/suse-11.3/suse-pxe-client/config.xml b/doc/examples/suse-11.3/suse-pxe-client/config.xml
index 7a83f1e..09167bf 100644
--- a/doc/examples/suse-11.3/suse-pxe-client/config.xml
+++ b/doc/examples/suse-11.3/suse-pxe-client/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="suse-11.3-pxe-client">
+<image schemaversion="4.7" name="suse-11.3-pxe-client">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
diff --git a/doc/kiwi-man/KIWI::config.sh.1 b/doc/kiwi-man/KIWI::config.sh.1
index 0b0f8cf..8a2f185 100644
--- a/doc/kiwi-man/KIWI::config.sh.1
+++ b/doc/kiwi-man/KIWI::config.sh.1
@@ -1,12 +1,12 @@
 .\"     Title: kiwi::config.sh
 .\"    Author: Marcus Schäfer <ms (AT) suse.de>
 .\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
-.\"      Date: Created: 06/25/2010
+.\"      Date: Created: 06/30/2010
 .\"    Manual: KIWI Manualpage
 .\"    Source: KIWI 4.43
 .\"  Language: English
 .\"
-.TH "KIWI::CONFIG\&.SH" "1" "Created: 06/25/2010" "KIWI 4\&.43" "KIWI Manualpage"
+.TH "KIWI::CONFIG\&.SH" "1" "Created: 06/30/2010" "KIWI 4\&.43" "KIWI Manualpage"
 .\" -----------------------------------------------------------------
 .\" * (re)Define some macros
 .\" -----------------------------------------------------------------
diff --git a/doc/kiwi-man/KIWI::images.sh.1 b/doc/kiwi-man/KIWI::images.sh.1
index 14992ac..b97e395 100644
--- a/doc/kiwi-man/KIWI::images.sh.1
+++ b/doc/kiwi-man/KIWI::images.sh.1
@@ -1,12 +1,12 @@
 .\"     Title: kiwi::images.sh
 .\"    Author: Marcus Schäfer <ms (AT) suse.de>
 .\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
-.\"      Date: Created: 06/25/2010
+.\"      Date: Created: 06/30/2010
 .\"    Manual: KIWI Manualpage
 .\"    Source: KIWI 4.43
 .\"  Language: English
 .\"
-.TH "KIWI::IMAGES\&.SH" "1" "Created: 06/25/2010" "KIWI 4\&.43" "KIWI Manualpage"
+.TH "KIWI::IMAGES\&.SH" "1" "Created: 06/30/2010" "KIWI 4\&.43" "KIWI Manualpage"
 .\" -----------------------------------------------------------------
 .\" * (re)Define some macros
 .\" -----------------------------------------------------------------
diff --git a/doc/kiwi-man/KIWI::kiwirc.1 b/doc/kiwi-man/KIWI::kiwirc.1
index 6187465..63c2f92 100644
--- a/doc/kiwi-man/KIWI::kiwirc.1
+++ b/doc/kiwi-man/KIWI::kiwirc.1
@@ -1,12 +1,12 @@
 .\"     Title: kiwi::kiwirc
 .\"    Author: Robert Schweikert <rschweikert (AT) novell.com>
 .\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
-.\"      Date: Created: 06/25/2010
+.\"      Date: Created: 06/30/2010
 .\"    Manual: KIWI Manualpage
 .\"    Source: >KIWI 4.43
 .\"  Language: English
 .\"
-.TH "KIWI::KIWIRC" "1" "Created: 06/25/2010" ">KIWI 4\&.43" "KIWI Manualpage"
+.TH "KIWI::KIWIRC" "1" "Created: 06/30/2010" ">KIWI 4\&.43" "KIWI Manualpage"
 .\" -----------------------------------------------------------------
 .\" * (re)Define some macros
 .\" -----------------------------------------------------------------
diff --git a/doc/kiwi-man/kiwi-man.xml b/doc/kiwi-man/kiwi-man.xml
index 60e8898..70c2928 100644
--- a/doc/kiwi-man/kiwi-man.xml
+++ b/doc/kiwi-man/kiwi-man.xml
@@ -239,7 +239,6 @@
       <arg choice="plain">--bootvm <replaceable>initrd</replaceable></arg>
       <arg choice="plain">--bootvm-system <replaceable>systemImage</replaceable></arg>
       <arg choice="opt">--bootvm-disksize <replaceable>size</replaceable></arg>
-      <arg choice="opt">--bootvm-format <replaceable>format</replaceable></arg>
     </cmdsynopsis>
     <cmdsynopsis><command>kiwi</command>
       <arg choice="plain">--bootcd <replaceable>initrd</replaceable></arg>
@@ -253,7 +252,22 @@
       <arg choice="plain">--installstick-system <replaceable>vmx-system-image</replaceable></arg>
     </cmdsynopsis>
   </refsect1>
-  
+ 
+  <refsect1>
+    <title>Image format conversion</title>
+    <para>
+      The KIWI format conversion is useful to perform the creation of
+	  another image output format like vmdk for VMware or ovf the open
+      virtual machine format. Along with the conversion kiwi also creates
+      the virtual machine configuration according to the format if
+      there is a machine section specified in the xml description
+    </para>
+    <cmdsynopsis><command>kiwi</command>
+      <arg choice="plain">--convert <replaceable>systemImage</replaceable></arg>
+      <arg choice="opt">--format <replaceable>vmdk|ovf|qcow2</replaceable></arg>
+    </cmdsynopsis>
+  </refsect1>
+ 
   <refsect1>
     <title>Testsuite</title>
     <para>
diff --git a/doc/kiwi-man/kiwi.1 b/doc/kiwi-man/kiwi.1
index 01354b1..ae51c87 100644
--- a/doc/kiwi-man/kiwi.1
+++ b/doc/kiwi-man/kiwi.1
@@ -1,12 +1,12 @@
 .\"     Title: kiwi
 .\"    Author: Marcus Schaefer <ms (AT) suse.de>
 .\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
-.\"      Date: Created: 06/25/2010
+.\"      Date: Created: 06/30/2010
 .\"    Manual: KIWI Manualpage
 .\"    Source: KIWI 4.43
 .\"  Language: English
 .\"
-.TH "KIWI" "1" "Created: 06/25/2010" "KIWI 4\&.43" "KIWI Manualpage"
+.TH "KIWI" "1" "Created: 06/30/2010" "KIWI 4\&.43" "KIWI Manualpage"
 .\" -----------------------------------------------------------------
 .\" * (re)Define some macros
 .\" -----------------------------------------------------------------
@@ -231,7 +231,7 @@ The KIWI post\-processing modes are used for special image deployment tasks, lik
 .fam
 .fam C
 .HP \w'\fBkiwi\fR\ 'u
-\fBkiwi\fR \-\-bootvm\ \fIinitrd\fR \-\-bootvm\-system\ \fIsystemImage\fR [\-\-bootvm\-disksize\ \fIsize\fR] [\-\-bootvm\-format\ \fIformat\fR]
+\fBkiwi\fR \-\-bootvm\ \fIinitrd\fR \-\-bootvm\-system\ \fIsystemImage\fR [\-\-bootvm\-disksize\ \fIsize\fR]
 .fam
 .fam C
 .HP \w'\fBkiwi\fR\ 'u
@@ -245,6 +245,13 @@ The KIWI post\-processing modes are used for special image deployment tasks, lik
 .HP \w'\fBkiwi\fR\ 'u
 \fBkiwi\fR \-\-installstick\ \fIinitrd\fR \-\-installstick\-system\ \fIvmx\-system\-image\fR
 .fam
+.SH "Image format conversion"
+.PP
+The KIWI format conversion is useful to perform the creation of another image output format like vmdk for VMware or ovf the open virtual machine format\&. Along with the conversion kiwi also creates the virtual machine configuration according to the format if there is a machine section specified in the xml description
+.fam C
+.HP \w'\fBkiwi\fR\ 'u
+\fBkiwi\fR \-\-convert\ \fIsystemImage\fR [\-\-format\ \fIvmdk|ovf|qcow2\fR]
+.fam
 .SH "Testsuite"
 .PP
 The KIWI test suite is useful to perform basic quality checks on the image root directory\&. The test cases are stored in subdirectories below
diff --git a/doc/kiwi.pdf b/doc/kiwi.pdf
index f5ac3b7..54bf7a7 100644
Binary files a/doc/kiwi.pdf and b/doc/kiwi.pdf differ
diff --git a/doc/schema/images/kiwi.html0.jpeg b/doc/schema/images/kiwi.html0.jpeg
index fdb9dba..854468a 100644
Binary files a/doc/schema/images/kiwi.html0.jpeg and b/doc/schema/images/kiwi.html0.jpeg differ
diff --git a/doc/schema/images/kiwi.html1.jpeg b/doc/schema/images/kiwi.html1.jpeg
index d8eade0..c773306 100644
Binary files a/doc/schema/images/kiwi.html1.jpeg and b/doc/schema/images/kiwi.html1.jpeg differ
diff --git a/doc/schema/images/kiwi.html10.jpeg b/doc/schema/images/kiwi.html10.jpeg
index e718a12..9c37622 100644
Binary files a/doc/schema/images/kiwi.html10.jpeg and b/doc/schema/images/kiwi.html10.jpeg differ
diff --git a/doc/schema/images/kiwi.html100.jpeg b/doc/schema/images/kiwi.html100.jpeg
index cf5516b..3425f49 100644
Binary files a/doc/schema/images/kiwi.html100.jpeg and b/doc/schema/images/kiwi.html100.jpeg differ
diff --git a/doc/schema/images/kiwi.html101.jpeg b/doc/schema/images/kiwi.html101.jpeg
index 4a1c32d..2d8e82c 100644
Binary files a/doc/schema/images/kiwi.html101.jpeg and b/doc/schema/images/kiwi.html101.jpeg differ
diff --git a/doc/schema/images/kiwi.html102.jpeg b/doc/schema/images/kiwi.html102.jpeg
index bd119a4..ce268a9 100644
Binary files a/doc/schema/images/kiwi.html102.jpeg and b/doc/schema/images/kiwi.html102.jpeg differ
diff --git a/doc/schema/images/kiwi.html103.jpeg b/doc/schema/images/kiwi.html103.jpeg
index ab72371..fd6c06e 100644
Binary files a/doc/schema/images/kiwi.html103.jpeg and b/doc/schema/images/kiwi.html103.jpeg differ
diff --git a/doc/schema/images/kiwi.html104.jpeg b/doc/schema/images/kiwi.html104.jpeg
index db00742..37097a0 100644
Binary files a/doc/schema/images/kiwi.html104.jpeg and b/doc/schema/images/kiwi.html104.jpeg differ
diff --git a/doc/schema/images/kiwi.html105.jpeg b/doc/schema/images/kiwi.html105.jpeg
index 060abb6..73beb1b 100644
Binary files a/doc/schema/images/kiwi.html105.jpeg and b/doc/schema/images/kiwi.html105.jpeg differ
diff --git a/doc/schema/images/kiwi.html106.jpeg b/doc/schema/images/kiwi.html106.jpeg
index bd61abe..8b47fcf 100644
Binary files a/doc/schema/images/kiwi.html106.jpeg and b/doc/schema/images/kiwi.html106.jpeg differ
diff --git a/doc/schema/images/kiwi.html107.jpeg b/doc/schema/images/kiwi.html107.jpeg
index 4b1d418..ac85fb7 100644
Binary files a/doc/schema/images/kiwi.html107.jpeg and b/doc/schema/images/kiwi.html107.jpeg differ
diff --git a/doc/schema/images/kiwi.html108.jpeg b/doc/schema/images/kiwi.html108.jpeg
index f9e50c0..50530ed 100644
Binary files a/doc/schema/images/kiwi.html108.jpeg and b/doc/schema/images/kiwi.html108.jpeg differ
diff --git a/doc/schema/images/kiwi.html109.jpeg b/doc/schema/images/kiwi.html109.jpeg
index 18c3f5e..7f74439 100644
Binary files a/doc/schema/images/kiwi.html109.jpeg and b/doc/schema/images/kiwi.html109.jpeg differ
diff --git a/doc/schema/images/kiwi.html11.jpeg b/doc/schema/images/kiwi.html11.jpeg
index a758e09..5b8cab7 100644
Binary files a/doc/schema/images/kiwi.html11.jpeg and b/doc/schema/images/kiwi.html11.jpeg differ
diff --git a/doc/schema/images/kiwi.html110.jpeg b/doc/schema/images/kiwi.html110.jpeg
index 1aa0011..7a8ea43 100644
Binary files a/doc/schema/images/kiwi.html110.jpeg and b/doc/schema/images/kiwi.html110.jpeg differ
diff --git a/doc/schema/images/kiwi.html111.jpeg b/doc/schema/images/kiwi.html111.jpeg
index 0306d9d..4a11162 100644
Binary files a/doc/schema/images/kiwi.html111.jpeg and b/doc/schema/images/kiwi.html111.jpeg differ
diff --git a/doc/schema/images/kiwi.html112.jpeg b/doc/schema/images/kiwi.html112.jpeg
index e421554..4a20860 100644
Binary files a/doc/schema/images/kiwi.html112.jpeg and b/doc/schema/images/kiwi.html112.jpeg differ
diff --git a/doc/schema/images/kiwi.html113.jpeg b/doc/schema/images/kiwi.html113.jpeg
index d5f07ba..599fcdf 100644
Binary files a/doc/schema/images/kiwi.html113.jpeg and b/doc/schema/images/kiwi.html113.jpeg differ
diff --git a/doc/schema/images/kiwi.html114.jpeg b/doc/schema/images/kiwi.html114.jpeg
index a7ef12e..8742d0d 100644
Binary files a/doc/schema/images/kiwi.html114.jpeg and b/doc/schema/images/kiwi.html114.jpeg differ
diff --git a/doc/schema/images/kiwi.html115.jpeg b/doc/schema/images/kiwi.html115.jpeg
index a2219a7..7837a04 100644
Binary files a/doc/schema/images/kiwi.html115.jpeg and b/doc/schema/images/kiwi.html115.jpeg differ
diff --git a/doc/schema/images/kiwi.html116.jpeg b/doc/schema/images/kiwi.html116.jpeg
index 9ab29db..ce79b22 100644
Binary files a/doc/schema/images/kiwi.html116.jpeg and b/doc/schema/images/kiwi.html116.jpeg differ
diff --git a/doc/schema/images/kiwi.html117.jpeg b/doc/schema/images/kiwi.html117.jpeg
index 2b17a03..bd3a331 100644
Binary files a/doc/schema/images/kiwi.html117.jpeg and b/doc/schema/images/kiwi.html117.jpeg differ
diff --git a/doc/schema/images/kiwi.html118.jpeg b/doc/schema/images/kiwi.html118.jpeg
index 6d37b10..2c3a7e9 100644
Binary files a/doc/schema/images/kiwi.html118.jpeg and b/doc/schema/images/kiwi.html118.jpeg differ
diff --git a/doc/schema/images/kiwi.html119.jpeg b/doc/schema/images/kiwi.html119.jpeg
index 74e47ac..b3e4ebb 100644
Binary files a/doc/schema/images/kiwi.html119.jpeg and b/doc/schema/images/kiwi.html119.jpeg differ
diff --git a/doc/schema/images/kiwi.html12.jpeg b/doc/schema/images/kiwi.html12.jpeg
index a639220..2bb71cd 100644
Binary files a/doc/schema/images/kiwi.html12.jpeg and b/doc/schema/images/kiwi.html12.jpeg differ
diff --git a/doc/schema/images/kiwi.html120.jpeg b/doc/schema/images/kiwi.html120.jpeg
index 7f6d91e..3239363 100644
Binary files a/doc/schema/images/kiwi.html120.jpeg and b/doc/schema/images/kiwi.html120.jpeg differ
diff --git a/doc/schema/images/kiwi.html121.jpeg b/doc/schema/images/kiwi.html121.jpeg
index b2d667a..c6f86bb 100644
Binary files a/doc/schema/images/kiwi.html121.jpeg and b/doc/schema/images/kiwi.html121.jpeg differ
diff --git a/doc/schema/images/kiwi.html122.jpeg b/doc/schema/images/kiwi.html122.jpeg
index 485cbe0..3bd52c2 100644
Binary files a/doc/schema/images/kiwi.html122.jpeg and b/doc/schema/images/kiwi.html122.jpeg differ
diff --git a/doc/schema/images/kiwi.html123.jpeg b/doc/schema/images/kiwi.html123.jpeg
index d7f54c4..e1e5a86 100644
Binary files a/doc/schema/images/kiwi.html123.jpeg and b/doc/schema/images/kiwi.html123.jpeg differ
diff --git a/doc/schema/images/kiwi.html124.jpeg b/doc/schema/images/kiwi.html124.jpeg
index f1fd314..6af0308 100644
Binary files a/doc/schema/images/kiwi.html124.jpeg and b/doc/schema/images/kiwi.html124.jpeg differ
diff --git a/doc/schema/images/kiwi.html125.jpeg b/doc/schema/images/kiwi.html125.jpeg
index f5403ca..4b8b3b4 100644
Binary files a/doc/schema/images/kiwi.html125.jpeg and b/doc/schema/images/kiwi.html125.jpeg differ
diff --git a/doc/schema/images/kiwi.html126.jpeg b/doc/schema/images/kiwi.html126.jpeg
index 2dafe3e..0a66d2e 100644
Binary files a/doc/schema/images/kiwi.html126.jpeg and b/doc/schema/images/kiwi.html126.jpeg differ
diff --git a/doc/schema/images/kiwi.html127.jpeg b/doc/schema/images/kiwi.html127.jpeg
index 4c376e9..f800da1 100644
Binary files a/doc/schema/images/kiwi.html127.jpeg and b/doc/schema/images/kiwi.html127.jpeg differ
diff --git a/doc/schema/images/kiwi.html128.jpeg b/doc/schema/images/kiwi.html128.jpeg
index 06c9aed..fa7aa6f 100644
Binary files a/doc/schema/images/kiwi.html128.jpeg and b/doc/schema/images/kiwi.html128.jpeg differ
diff --git a/doc/schema/images/kiwi.html129.jpeg b/doc/schema/images/kiwi.html129.jpeg
index a50ecb3..c1487ac 100644
Binary files a/doc/schema/images/kiwi.html129.jpeg and b/doc/schema/images/kiwi.html129.jpeg differ
diff --git a/doc/schema/images/kiwi.html13.jpeg b/doc/schema/images/kiwi.html13.jpeg
index b67db01..7006201 100644
Binary files a/doc/schema/images/kiwi.html13.jpeg and b/doc/schema/images/kiwi.html13.jpeg differ
diff --git a/doc/schema/images/kiwi.html130.jpeg b/doc/schema/images/kiwi.html130.jpeg
index db43b0f..ec803c2 100644
Binary files a/doc/schema/images/kiwi.html130.jpeg and b/doc/schema/images/kiwi.html130.jpeg differ
diff --git a/doc/schema/images/kiwi.html131.jpeg b/doc/schema/images/kiwi.html131.jpeg
index 04a91cb..91cc9e8 100644
Binary files a/doc/schema/images/kiwi.html131.jpeg and b/doc/schema/images/kiwi.html131.jpeg differ
diff --git a/doc/schema/images/kiwi.html132.jpeg b/doc/schema/images/kiwi.html132.jpeg
index 229693c..2c25587 100644
Binary files a/doc/schema/images/kiwi.html132.jpeg and b/doc/schema/images/kiwi.html132.jpeg differ
diff --git a/doc/schema/images/kiwi.html133.jpeg b/doc/schema/images/kiwi.html133.jpeg
index 98e8421..7540eb2 100644
Binary files a/doc/schema/images/kiwi.html133.jpeg and b/doc/schema/images/kiwi.html133.jpeg differ
diff --git a/doc/schema/images/kiwi.html134.jpeg b/doc/schema/images/kiwi.html134.jpeg
index 5950a10..5206bcb 100644
Binary files a/doc/schema/images/kiwi.html134.jpeg and b/doc/schema/images/kiwi.html134.jpeg differ
diff --git a/doc/schema/images/kiwi.html135.jpeg b/doc/schema/images/kiwi.html135.jpeg
index 9a5c59b..6d37b10 100644
Binary files a/doc/schema/images/kiwi.html135.jpeg and b/doc/schema/images/kiwi.html135.jpeg differ
diff --git a/doc/schema/images/kiwi.html136.jpeg b/doc/schema/images/kiwi.html136.jpeg
index 255afbc..8ee4d9b 100644
Binary files a/doc/schema/images/kiwi.html136.jpeg and b/doc/schema/images/kiwi.html136.jpeg differ
diff --git a/doc/schema/images/kiwi.html137.jpeg b/doc/schema/images/kiwi.html137.jpeg
index b2a2281..5db54ce 100644
Binary files a/doc/schema/images/kiwi.html137.jpeg and b/doc/schema/images/kiwi.html137.jpeg differ
diff --git a/doc/schema/images/kiwi.html138.jpeg b/doc/schema/images/kiwi.html138.jpeg
index 0ccc885..07403ef 100644
Binary files a/doc/schema/images/kiwi.html138.jpeg and b/doc/schema/images/kiwi.html138.jpeg differ
diff --git a/doc/schema/images/kiwi.html139.jpeg b/doc/schema/images/kiwi.html139.jpeg
index 36ebe62..2ff1a4c 100644
Binary files a/doc/schema/images/kiwi.html139.jpeg and b/doc/schema/images/kiwi.html139.jpeg differ
diff --git a/doc/schema/images/kiwi.html14.jpeg b/doc/schema/images/kiwi.html14.jpeg
index dc2e78e..c44364e 100644
Binary files a/doc/schema/images/kiwi.html14.jpeg and b/doc/schema/images/kiwi.html14.jpeg differ
diff --git a/doc/schema/images/kiwi.html140.jpeg b/doc/schema/images/kiwi.html140.jpeg
index 7669388..d88ff2a 100644
Binary files a/doc/schema/images/kiwi.html140.jpeg and b/doc/schema/images/kiwi.html140.jpeg differ
diff --git a/doc/schema/images/kiwi.html141.jpeg b/doc/schema/images/kiwi.html141.jpeg
index f5d8865..e54317c 100644
Binary files a/doc/schema/images/kiwi.html141.jpeg and b/doc/schema/images/kiwi.html141.jpeg differ
diff --git a/doc/schema/images/kiwi.html142.jpeg b/doc/schema/images/kiwi.html142.jpeg
index 7f76267..fb82e7d 100644
Binary files a/doc/schema/images/kiwi.html142.jpeg and b/doc/schema/images/kiwi.html142.jpeg differ
diff --git a/doc/schema/images/kiwi.html143.jpeg b/doc/schema/images/kiwi.html143.jpeg
index 72699c5..8ce5af7 100644
Binary files a/doc/schema/images/kiwi.html143.jpeg and b/doc/schema/images/kiwi.html143.jpeg differ
diff --git a/doc/schema/images/kiwi.html144.jpeg b/doc/schema/images/kiwi.html144.jpeg
index 3e1108c..e7ce870 100644
Binary files a/doc/schema/images/kiwi.html144.jpeg and b/doc/schema/images/kiwi.html144.jpeg differ
diff --git a/doc/schema/images/kiwi.html145.jpeg b/doc/schema/images/kiwi.html145.jpeg
index e7cf362..ebc78d1 100644
Binary files a/doc/schema/images/kiwi.html145.jpeg and b/doc/schema/images/kiwi.html145.jpeg differ
diff --git a/doc/schema/images/kiwi.html146.jpeg b/doc/schema/images/kiwi.html146.jpeg
index f137f89..03c50d6 100644
Binary files a/doc/schema/images/kiwi.html146.jpeg and b/doc/schema/images/kiwi.html146.jpeg differ
diff --git a/doc/schema/images/kiwi.html147.jpeg b/doc/schema/images/kiwi.html147.jpeg
index cab9c43..89ff188 100644
Binary files a/doc/schema/images/kiwi.html147.jpeg and b/doc/schema/images/kiwi.html147.jpeg differ
diff --git a/doc/schema/images/kiwi.html148.jpeg b/doc/schema/images/kiwi.html148.jpeg
index bf572dd..4e5f5cb 100644
Binary files a/doc/schema/images/kiwi.html148.jpeg and b/doc/schema/images/kiwi.html148.jpeg differ
diff --git a/doc/schema/images/kiwi.html149.jpeg b/doc/schema/images/kiwi.html149.jpeg
index ca39670..32bd1e4 100644
Binary files a/doc/schema/images/kiwi.html149.jpeg and b/doc/schema/images/kiwi.html149.jpeg differ
diff --git a/doc/schema/images/kiwi.html15.jpeg b/doc/schema/images/kiwi.html15.jpeg
index 6b17406..f9946b2 100644
Binary files a/doc/schema/images/kiwi.html15.jpeg and b/doc/schema/images/kiwi.html15.jpeg differ
diff --git a/doc/schema/images/kiwi.html150.jpeg b/doc/schema/images/kiwi.html150.jpeg
index af6e79d..418b455 100644
Binary files a/doc/schema/images/kiwi.html150.jpeg and b/doc/schema/images/kiwi.html150.jpeg differ
diff --git a/doc/schema/images/kiwi.html151.jpeg b/doc/schema/images/kiwi.html151.jpeg
index a05723d..b2f03a8 100644
Binary files a/doc/schema/images/kiwi.html151.jpeg and b/doc/schema/images/kiwi.html151.jpeg differ
diff --git a/doc/schema/images/kiwi.html152.jpeg b/doc/schema/images/kiwi.html152.jpeg
index 2376f6b..a0bb952 100644
Binary files a/doc/schema/images/kiwi.html152.jpeg and b/doc/schema/images/kiwi.html152.jpeg differ
diff --git a/doc/schema/images/kiwi.html153.jpeg b/doc/schema/images/kiwi.html153.jpeg
index 000146d..6411bff 100644
Binary files a/doc/schema/images/kiwi.html153.jpeg and b/doc/schema/images/kiwi.html153.jpeg differ
diff --git a/doc/schema/images/kiwi.html154.jpeg b/doc/schema/images/kiwi.html154.jpeg
index 3183a7c..000c89c 100644
Binary files a/doc/schema/images/kiwi.html154.jpeg and b/doc/schema/images/kiwi.html154.jpeg differ
diff --git a/doc/schema/images/kiwi.html155.jpeg b/doc/schema/images/kiwi.html155.jpeg
index 3cfb6c3..96ffc23 100644
Binary files a/doc/schema/images/kiwi.html155.jpeg and b/doc/schema/images/kiwi.html155.jpeg differ
diff --git a/doc/schema/images/kiwi.html156.jpeg b/doc/schema/images/kiwi.html156.jpeg
index 61ba10d..31d9b8b 100644
Binary files a/doc/schema/images/kiwi.html156.jpeg and b/doc/schema/images/kiwi.html156.jpeg differ
diff --git a/doc/schema/images/kiwi.html157.jpeg b/doc/schema/images/kiwi.html157.jpeg
index ba90adf..e662ace 100644
Binary files a/doc/schema/images/kiwi.html157.jpeg and b/doc/schema/images/kiwi.html157.jpeg differ
diff --git a/doc/schema/images/kiwi.html158.jpeg b/doc/schema/images/kiwi.html158.jpeg
index fbef069..97669b2 100644
Binary files a/doc/schema/images/kiwi.html158.jpeg and b/doc/schema/images/kiwi.html158.jpeg differ
diff --git a/doc/schema/images/kiwi.html159.jpeg b/doc/schema/images/kiwi.html159.jpeg
index 55b9b01..97fc17b 100644
Binary files a/doc/schema/images/kiwi.html159.jpeg and b/doc/schema/images/kiwi.html159.jpeg differ
diff --git a/doc/schema/images/kiwi.html16.jpeg b/doc/schema/images/kiwi.html16.jpeg
index 4f3fe6a..c306403 100644
Binary files a/doc/schema/images/kiwi.html16.jpeg and b/doc/schema/images/kiwi.html16.jpeg differ
diff --git a/doc/schema/images/kiwi.html160.jpeg b/doc/schema/images/kiwi.html160.jpeg
index ab8c2ae..ad93f82 100644
Binary files a/doc/schema/images/kiwi.html160.jpeg and b/doc/schema/images/kiwi.html160.jpeg differ
diff --git a/doc/schema/images/kiwi.html161.jpeg b/doc/schema/images/kiwi.html161.jpeg
index da3d58b..96c229d 100644
Binary files a/doc/schema/images/kiwi.html161.jpeg and b/doc/schema/images/kiwi.html161.jpeg differ
diff --git a/doc/schema/images/kiwi.html162.jpeg b/doc/schema/images/kiwi.html162.jpeg
index 0066c85..8709c39 100644
Binary files a/doc/schema/images/kiwi.html162.jpeg and b/doc/schema/images/kiwi.html162.jpeg differ
diff --git a/doc/schema/images/kiwi.html163.jpeg b/doc/schema/images/kiwi.html163.jpeg
index 8da8e3f..6384b1d 100644
Binary files a/doc/schema/images/kiwi.html163.jpeg and b/doc/schema/images/kiwi.html163.jpeg differ
diff --git a/doc/schema/images/kiwi.html164.jpeg b/doc/schema/images/kiwi.html164.jpeg
index 5824687..33e988f 100644
Binary files a/doc/schema/images/kiwi.html164.jpeg and b/doc/schema/images/kiwi.html164.jpeg differ
diff --git a/doc/schema/images/kiwi.html165.jpeg b/doc/schema/images/kiwi.html165.jpeg
index 62dba2f..b8995af 100644
Binary files a/doc/schema/images/kiwi.html165.jpeg and b/doc/schema/images/kiwi.html165.jpeg differ
diff --git a/doc/schema/images/kiwi.html166.jpeg b/doc/schema/images/kiwi.html166.jpeg
index ee5015b..f0497c2 100644
Binary files a/doc/schema/images/kiwi.html166.jpeg and b/doc/schema/images/kiwi.html166.jpeg differ
diff --git a/doc/schema/images/kiwi.html167.jpeg b/doc/schema/images/kiwi.html167.jpeg
index b31caec..7a67882 100644
Binary files a/doc/schema/images/kiwi.html167.jpeg and b/doc/schema/images/kiwi.html167.jpeg differ
diff --git a/doc/schema/images/kiwi.html168.jpeg b/doc/schema/images/kiwi.html168.jpeg
index 872fcf3..69f3c9e 100644
Binary files a/doc/schema/images/kiwi.html168.jpeg and b/doc/schema/images/kiwi.html168.jpeg differ
diff --git a/doc/schema/images/kiwi.html169.jpeg b/doc/schema/images/kiwi.html169.jpeg
index 732cd14..d0db1de 100644
Binary files a/doc/schema/images/kiwi.html169.jpeg and b/doc/schema/images/kiwi.html169.jpeg differ
diff --git a/doc/schema/images/kiwi.html17.jpeg b/doc/schema/images/kiwi.html17.jpeg
index 47e22fd..fd89432 100644
Binary files a/doc/schema/images/kiwi.html17.jpeg and b/doc/schema/images/kiwi.html17.jpeg differ
diff --git a/doc/schema/images/kiwi.html170.jpeg b/doc/schema/images/kiwi.html170.jpeg
index eaba6bf..f11f8d5 100644
Binary files a/doc/schema/images/kiwi.html170.jpeg and b/doc/schema/images/kiwi.html170.jpeg differ
diff --git a/doc/schema/images/kiwi.html171.jpeg b/doc/schema/images/kiwi.html171.jpeg
index 2bb0cbf..17da3c5 100644
Binary files a/doc/schema/images/kiwi.html171.jpeg and b/doc/schema/images/kiwi.html171.jpeg differ
diff --git a/doc/schema/images/kiwi.html172.jpeg b/doc/schema/images/kiwi.html172.jpeg
index a11e2e8..e12334a 100644
Binary files a/doc/schema/images/kiwi.html172.jpeg and b/doc/schema/images/kiwi.html172.jpeg differ
diff --git a/doc/schema/images/kiwi.html173.jpeg b/doc/schema/images/kiwi.html173.jpeg
index 83d857f..d1adaed 100644
Binary files a/doc/schema/images/kiwi.html173.jpeg and b/doc/schema/images/kiwi.html173.jpeg differ
diff --git a/doc/schema/images/kiwi.html175.jpeg b/doc/schema/images/kiwi.html175.jpeg
index d00a250..8cb15db 100644
Binary files a/doc/schema/images/kiwi.html175.jpeg and b/doc/schema/images/kiwi.html175.jpeg differ
diff --git a/doc/schema/images/kiwi.html176.jpeg b/doc/schema/images/kiwi.html176.jpeg
index 80848b2..aa9cb1d 100644
Binary files a/doc/schema/images/kiwi.html176.jpeg and b/doc/schema/images/kiwi.html176.jpeg differ
diff --git a/doc/schema/images/kiwi.html177.jpeg b/doc/schema/images/kiwi.html177.jpeg
index 3f49e0c..b798366 100644
Binary files a/doc/schema/images/kiwi.html177.jpeg and b/doc/schema/images/kiwi.html177.jpeg differ
diff --git a/doc/schema/images/kiwi.html178.jpeg b/doc/schema/images/kiwi.html178.jpeg
index f045b3f..3a9c5f0 100644
Binary files a/doc/schema/images/kiwi.html178.jpeg and b/doc/schema/images/kiwi.html178.jpeg differ
diff --git a/doc/schema/images/kiwi.html179.jpeg b/doc/schema/images/kiwi.html179.jpeg
index 8742ef3..ab8c2ae 100644
Binary files a/doc/schema/images/kiwi.html179.jpeg and b/doc/schema/images/kiwi.html179.jpeg differ
diff --git a/doc/schema/images/kiwi.html18.jpeg b/doc/schema/images/kiwi.html18.jpeg
index 67a60a2..29cf4be 100644
Binary files a/doc/schema/images/kiwi.html18.jpeg and b/doc/schema/images/kiwi.html18.jpeg differ
diff --git a/doc/schema/images/kiwi.html180.jpeg b/doc/schema/images/kiwi.html180.jpeg
index 2e0d3b7..f42928d 100644
Binary files a/doc/schema/images/kiwi.html180.jpeg and b/doc/schema/images/kiwi.html180.jpeg differ
diff --git a/doc/schema/images/kiwi.html181.jpeg b/doc/schema/images/kiwi.html181.jpeg
index fe9ceed..83cb113 100644
Binary files a/doc/schema/images/kiwi.html181.jpeg and b/doc/schema/images/kiwi.html181.jpeg differ
diff --git a/doc/schema/images/kiwi.html182.jpeg b/doc/schema/images/kiwi.html182.jpeg
index 79f5254..16c5bf8 100644
Binary files a/doc/schema/images/kiwi.html182.jpeg and b/doc/schema/images/kiwi.html182.jpeg differ
diff --git a/doc/schema/images/kiwi.html183.jpeg b/doc/schema/images/kiwi.html183.jpeg
index 447f0de..c11856d 100644
Binary files a/doc/schema/images/kiwi.html183.jpeg and b/doc/schema/images/kiwi.html183.jpeg differ
diff --git a/doc/schema/images/kiwi.html184.jpeg b/doc/schema/images/kiwi.html184.jpeg
index afc0b8b..87ce5ac 100644
Binary files a/doc/schema/images/kiwi.html184.jpeg and b/doc/schema/images/kiwi.html184.jpeg differ
diff --git a/doc/schema/images/kiwi.html185.jpeg b/doc/schema/images/kiwi.html185.jpeg
index d38f56b..1c32345 100644
Binary files a/doc/schema/images/kiwi.html185.jpeg and b/doc/schema/images/kiwi.html185.jpeg differ
diff --git a/doc/schema/images/kiwi.html186.jpeg b/doc/schema/images/kiwi.html186.jpeg
index b6b3e34..270d1c2 100644
Binary files a/doc/schema/images/kiwi.html186.jpeg and b/doc/schema/images/kiwi.html186.jpeg differ
diff --git a/doc/schema/images/kiwi.html187.jpeg b/doc/schema/images/kiwi.html187.jpeg
index 64dda40..5a87045 100644
Binary files a/doc/schema/images/kiwi.html187.jpeg and b/doc/schema/images/kiwi.html187.jpeg differ
diff --git a/doc/schema/images/kiwi.html188.jpeg b/doc/schema/images/kiwi.html188.jpeg
index 574428a..7c3c8a3 100644
Binary files a/doc/schema/images/kiwi.html188.jpeg and b/doc/schema/images/kiwi.html188.jpeg differ
diff --git a/doc/schema/images/kiwi.html189.jpeg b/doc/schema/images/kiwi.html189.jpeg
index 6405158..5504852 100644
Binary files a/doc/schema/images/kiwi.html189.jpeg and b/doc/schema/images/kiwi.html189.jpeg differ
diff --git a/doc/schema/images/kiwi.html19.jpeg b/doc/schema/images/kiwi.html19.jpeg
index df8b6f1..541faee 100644
Binary files a/doc/schema/images/kiwi.html19.jpeg and b/doc/schema/images/kiwi.html19.jpeg differ
diff --git a/doc/schema/images/kiwi.html190.jpeg b/doc/schema/images/kiwi.html190.jpeg
index f61fbcc..e25e1c6 100644
Binary files a/doc/schema/images/kiwi.html190.jpeg and b/doc/schema/images/kiwi.html190.jpeg differ
diff --git a/doc/schema/images/kiwi.html191.jpeg b/doc/schema/images/kiwi.html191.jpeg
index 00da715..6e2f538 100644
Binary files a/doc/schema/images/kiwi.html191.jpeg and b/doc/schema/images/kiwi.html191.jpeg differ
diff --git a/doc/schema/images/kiwi.html192.jpeg b/doc/schema/images/kiwi.html192.jpeg
index ae2ffdf..3098756 100644
Binary files a/doc/schema/images/kiwi.html192.jpeg and b/doc/schema/images/kiwi.html192.jpeg differ
diff --git a/doc/schema/images/kiwi.html193.jpeg b/doc/schema/images/kiwi.html193.jpeg
index 7cd1496..c939f91 100644
Binary files a/doc/schema/images/kiwi.html193.jpeg and b/doc/schema/images/kiwi.html193.jpeg differ
diff --git a/doc/schema/images/kiwi.html194.jpeg b/doc/schema/images/kiwi.html194.jpeg
index 2f106c5..3e72824 100644
Binary files a/doc/schema/images/kiwi.html194.jpeg and b/doc/schema/images/kiwi.html194.jpeg differ
diff --git a/doc/schema/images/kiwi.html195.jpeg b/doc/schema/images/kiwi.html195.jpeg
index 3fe662d..d9b664d 100644
Binary files a/doc/schema/images/kiwi.html195.jpeg and b/doc/schema/images/kiwi.html195.jpeg differ
diff --git a/doc/schema/images/kiwi.html196.jpeg b/doc/schema/images/kiwi.html196.jpeg
index ee70c16..7449517 100644
Binary files a/doc/schema/images/kiwi.html196.jpeg and b/doc/schema/images/kiwi.html196.jpeg differ
diff --git a/doc/schema/images/kiwi.html197.jpeg b/doc/schema/images/kiwi.html197.jpeg
index 632c808..58993b3 100644
Binary files a/doc/schema/images/kiwi.html197.jpeg and b/doc/schema/images/kiwi.html197.jpeg differ
diff --git a/doc/schema/images/kiwi.html198.jpeg b/doc/schema/images/kiwi.html198.jpeg
index 8d82f5e..cfb0520 100644
Binary files a/doc/schema/images/kiwi.html198.jpeg and b/doc/schema/images/kiwi.html198.jpeg differ
diff --git a/doc/schema/images/kiwi.html199.jpeg b/doc/schema/images/kiwi.html199.jpeg
index 0524401..810e9f4 100644
Binary files a/doc/schema/images/kiwi.html199.jpeg and b/doc/schema/images/kiwi.html199.jpeg differ
diff --git a/doc/schema/images/kiwi.html2.jpeg b/doc/schema/images/kiwi.html2.jpeg
index 91f84ab..caac649 100644
Binary files a/doc/schema/images/kiwi.html2.jpeg and b/doc/schema/images/kiwi.html2.jpeg differ
diff --git a/doc/schema/images/kiwi.html20.jpeg b/doc/schema/images/kiwi.html20.jpeg
index 27c9428..ce0f8e8 100644
Binary files a/doc/schema/images/kiwi.html20.jpeg and b/doc/schema/images/kiwi.html20.jpeg differ
diff --git a/doc/schema/images/kiwi.html200.jpeg b/doc/schema/images/kiwi.html200.jpeg
index ae277a9..159e410 100644
Binary files a/doc/schema/images/kiwi.html200.jpeg and b/doc/schema/images/kiwi.html200.jpeg differ
diff --git a/doc/schema/images/kiwi.html201.jpeg b/doc/schema/images/kiwi.html201.jpeg
index 5ddd619..67a60a2 100644
Binary files a/doc/schema/images/kiwi.html201.jpeg and b/doc/schema/images/kiwi.html201.jpeg differ
diff --git a/doc/schema/images/kiwi.html202.jpeg b/doc/schema/images/kiwi.html202.jpeg
index cd08570..04c2f45 100644
Binary files a/doc/schema/images/kiwi.html202.jpeg and b/doc/schema/images/kiwi.html202.jpeg differ
diff --git a/doc/schema/images/kiwi.html203.jpeg b/doc/schema/images/kiwi.html203.jpeg
index a5f1728..69b5aae 100644
Binary files a/doc/schema/images/kiwi.html203.jpeg and b/doc/schema/images/kiwi.html203.jpeg differ
diff --git a/doc/schema/images/kiwi.html204.jpeg b/doc/schema/images/kiwi.html204.jpeg
index 134af9b..afe2ff8 100644
Binary files a/doc/schema/images/kiwi.html204.jpeg and b/doc/schema/images/kiwi.html204.jpeg differ
diff --git a/doc/schema/images/kiwi.html205.jpeg b/doc/schema/images/kiwi.html205.jpeg
index 0b1d871..e3315d0 100644
Binary files a/doc/schema/images/kiwi.html205.jpeg and b/doc/schema/images/kiwi.html205.jpeg differ
diff --git a/doc/schema/images/kiwi.html206.jpeg b/doc/schema/images/kiwi.html206.jpeg
index f793933..f52bae6 100644
Binary files a/doc/schema/images/kiwi.html206.jpeg and b/doc/schema/images/kiwi.html206.jpeg differ
diff --git a/doc/schema/images/kiwi.html207.jpeg b/doc/schema/images/kiwi.html207.jpeg
index 99a9e5d..ab00909 100644
Binary files a/doc/schema/images/kiwi.html207.jpeg and b/doc/schema/images/kiwi.html207.jpeg differ
diff --git a/doc/schema/images/kiwi.html208.jpeg b/doc/schema/images/kiwi.html208.jpeg
index 5d6b180..e301fa6 100644
Binary files a/doc/schema/images/kiwi.html208.jpeg and b/doc/schema/images/kiwi.html208.jpeg differ
diff --git a/doc/schema/images/kiwi.html209.jpeg b/doc/schema/images/kiwi.html209.jpeg
index 75b4bd8..aed9fe0 100644
Binary files a/doc/schema/images/kiwi.html209.jpeg and b/doc/schema/images/kiwi.html209.jpeg differ
diff --git a/doc/schema/images/kiwi.html21.jpeg b/doc/schema/images/kiwi.html21.jpeg
index 2fd6fe6..dcecca0 100644
Binary files a/doc/schema/images/kiwi.html21.jpeg and b/doc/schema/images/kiwi.html21.jpeg differ
diff --git a/doc/schema/images/kiwi.html210.jpeg b/doc/schema/images/kiwi.html210.jpeg
index b628918..c00ddfd 100644
Binary files a/doc/schema/images/kiwi.html210.jpeg and b/doc/schema/images/kiwi.html210.jpeg differ
diff --git a/doc/schema/images/kiwi.html211.jpeg b/doc/schema/images/kiwi.html211.jpeg
index 8209bf5..08ed0d0 100644
Binary files a/doc/schema/images/kiwi.html211.jpeg and b/doc/schema/images/kiwi.html211.jpeg differ
diff --git a/doc/schema/images/kiwi.html212.jpeg b/doc/schema/images/kiwi.html212.jpeg
index 03cb121..2ea5b29 100644
Binary files a/doc/schema/images/kiwi.html212.jpeg and b/doc/schema/images/kiwi.html212.jpeg differ
diff --git a/doc/schema/images/kiwi.html213.jpeg b/doc/schema/images/kiwi.html213.jpeg
index 97e69d1..b7313d9 100644
Binary files a/doc/schema/images/kiwi.html213.jpeg and b/doc/schema/images/kiwi.html213.jpeg differ
diff --git a/doc/schema/images/kiwi.html214.jpeg b/doc/schema/images/kiwi.html214.jpeg
index 87702ac..74e74de 100644
Binary files a/doc/schema/images/kiwi.html214.jpeg and b/doc/schema/images/kiwi.html214.jpeg differ
diff --git a/doc/schema/images/kiwi.html215.jpeg b/doc/schema/images/kiwi.html215.jpeg
index a109771..98b844f 100644
Binary files a/doc/schema/images/kiwi.html215.jpeg and b/doc/schema/images/kiwi.html215.jpeg differ
diff --git a/doc/schema/images/kiwi.html216.jpeg b/doc/schema/images/kiwi.html216.jpeg
index 1749b5c..01d8fb5 100644
Binary files a/doc/schema/images/kiwi.html216.jpeg and b/doc/schema/images/kiwi.html216.jpeg differ
diff --git a/doc/schema/images/kiwi.html217.jpeg b/doc/schema/images/kiwi.html217.jpeg
index ecc0812..960a422 100644
Binary files a/doc/schema/images/kiwi.html217.jpeg and b/doc/schema/images/kiwi.html217.jpeg differ
diff --git a/doc/schema/images/kiwi.html218.jpeg b/doc/schema/images/kiwi.html218.jpeg
index a66a650..66d2133 100644
Binary files a/doc/schema/images/kiwi.html218.jpeg and b/doc/schema/images/kiwi.html218.jpeg differ
diff --git a/doc/schema/images/kiwi.html219.jpeg b/doc/schema/images/kiwi.html219.jpeg
index 7aa9679..2b8e845 100644
Binary files a/doc/schema/images/kiwi.html219.jpeg and b/doc/schema/images/kiwi.html219.jpeg differ
diff --git a/doc/schema/images/kiwi.html22.jpeg b/doc/schema/images/kiwi.html22.jpeg
index 0acb79f..c560bd2 100644
Binary files a/doc/schema/images/kiwi.html22.jpeg and b/doc/schema/images/kiwi.html22.jpeg differ
diff --git a/doc/schema/images/kiwi.html220.jpeg b/doc/schema/images/kiwi.html220.jpeg
index ca45867..2faa551 100644
Binary files a/doc/schema/images/kiwi.html220.jpeg and b/doc/schema/images/kiwi.html220.jpeg differ
diff --git a/doc/schema/images/kiwi.html221.jpeg b/doc/schema/images/kiwi.html221.jpeg
index 8dea5a6..272e058 100644
Binary files a/doc/schema/images/kiwi.html221.jpeg and b/doc/schema/images/kiwi.html221.jpeg differ
diff --git a/doc/schema/images/kiwi.html222.jpeg b/doc/schema/images/kiwi.html222.jpeg
index 1c44284..a92390a 100644
Binary files a/doc/schema/images/kiwi.html222.jpeg and b/doc/schema/images/kiwi.html222.jpeg differ
diff --git a/doc/schema/images/kiwi.html223.jpeg b/doc/schema/images/kiwi.html223.jpeg
index 87e2369..a852354 100644
Binary files a/doc/schema/images/kiwi.html223.jpeg and b/doc/schema/images/kiwi.html223.jpeg differ
diff --git a/doc/schema/images/kiwi.html224.jpeg b/doc/schema/images/kiwi.html224.jpeg
index cdb8f67..cc50430 100644
Binary files a/doc/schema/images/kiwi.html224.jpeg and b/doc/schema/images/kiwi.html224.jpeg differ
diff --git a/doc/schema/images/kiwi.html225.jpeg b/doc/schema/images/kiwi.html225.jpeg
index ab8853c..29f0f1d 100644
Binary files a/doc/schema/images/kiwi.html225.jpeg and b/doc/schema/images/kiwi.html225.jpeg differ
diff --git a/doc/schema/images/kiwi.html226.jpeg b/doc/schema/images/kiwi.html226.jpeg
index 1992a1a..894f696 100644
Binary files a/doc/schema/images/kiwi.html226.jpeg and b/doc/schema/images/kiwi.html226.jpeg differ
diff --git a/doc/schema/images/kiwi.html227.jpeg b/doc/schema/images/kiwi.html227.jpeg
index 24c7c53..c4f1003 100644
Binary files a/doc/schema/images/kiwi.html227.jpeg and b/doc/schema/images/kiwi.html227.jpeg differ
diff --git a/doc/schema/images/kiwi.html228.jpeg b/doc/schema/images/kiwi.html228.jpeg
index 0322823..3496722 100644
Binary files a/doc/schema/images/kiwi.html228.jpeg and b/doc/schema/images/kiwi.html228.jpeg differ
diff --git a/doc/schema/images/kiwi.html229.jpeg b/doc/schema/images/kiwi.html229.jpeg
index bb00ed3..06fa87b 100644
Binary files a/doc/schema/images/kiwi.html229.jpeg and b/doc/schema/images/kiwi.html229.jpeg differ
diff --git a/doc/schema/images/kiwi.html23.jpeg b/doc/schema/images/kiwi.html23.jpeg
index 06fe554..0a8bc04 100644
Binary files a/doc/schema/images/kiwi.html23.jpeg and b/doc/schema/images/kiwi.html23.jpeg differ
diff --git a/doc/schema/images/kiwi.html230.jpeg b/doc/schema/images/kiwi.html230.jpeg
index 71f9302..f6e686d 100644
Binary files a/doc/schema/images/kiwi.html230.jpeg and b/doc/schema/images/kiwi.html230.jpeg differ
diff --git a/doc/schema/images/kiwi.html231.jpeg b/doc/schema/images/kiwi.html231.jpeg
index cdfec55..e3446cc 100644
Binary files a/doc/schema/images/kiwi.html231.jpeg and b/doc/schema/images/kiwi.html231.jpeg differ
diff --git a/doc/schema/images/kiwi.html232.jpeg b/doc/schema/images/kiwi.html232.jpeg
index dfd8965..eb278f2 100644
Binary files a/doc/schema/images/kiwi.html232.jpeg and b/doc/schema/images/kiwi.html232.jpeg differ
diff --git a/doc/schema/images/kiwi.html233.jpeg b/doc/schema/images/kiwi.html233.jpeg
index 818ab7d..e421554 100644
Binary files a/doc/schema/images/kiwi.html233.jpeg and b/doc/schema/images/kiwi.html233.jpeg differ
diff --git a/doc/schema/images/kiwi.html234.jpeg b/doc/schema/images/kiwi.html234.jpeg
index 650221a..66edb2d 100644
Binary files a/doc/schema/images/kiwi.html234.jpeg and b/doc/schema/images/kiwi.html234.jpeg differ
diff --git a/doc/schema/images/kiwi.html235.jpeg b/doc/schema/images/kiwi.html235.jpeg
index 845fec2..05572de 100644
Binary files a/doc/schema/images/kiwi.html235.jpeg and b/doc/schema/images/kiwi.html235.jpeg differ
diff --git a/doc/schema/images/kiwi.html236.jpeg b/doc/schema/images/kiwi.html236.jpeg
index 229f457..1599e15 100644
Binary files a/doc/schema/images/kiwi.html236.jpeg and b/doc/schema/images/kiwi.html236.jpeg differ
diff --git a/doc/schema/images/kiwi.html237.jpeg b/doc/schema/images/kiwi.html237.jpeg
index 2b45832..277fa3c 100644
Binary files a/doc/schema/images/kiwi.html237.jpeg and b/doc/schema/images/kiwi.html237.jpeg differ
diff --git a/doc/schema/images/kiwi.html238.jpeg b/doc/schema/images/kiwi.html238.jpeg
index ef85d8a..9d1fe03 100644
Binary files a/doc/schema/images/kiwi.html238.jpeg and b/doc/schema/images/kiwi.html238.jpeg differ
diff --git a/doc/schema/images/kiwi.html239.jpeg b/doc/schema/images/kiwi.html239.jpeg
index d8e0821..8f988df 100644
Binary files a/doc/schema/images/kiwi.html239.jpeg and b/doc/schema/images/kiwi.html239.jpeg differ
diff --git a/doc/schema/images/kiwi.html24.jpeg b/doc/schema/images/kiwi.html24.jpeg
index 733a34e..b978a75 100644
Binary files a/doc/schema/images/kiwi.html24.jpeg and b/doc/schema/images/kiwi.html24.jpeg differ
diff --git a/doc/schema/images/kiwi.html240.jpeg b/doc/schema/images/kiwi.html240.jpeg
index f877598..2954e81 100644
Binary files a/doc/schema/images/kiwi.html240.jpeg and b/doc/schema/images/kiwi.html240.jpeg differ
diff --git a/doc/schema/images/kiwi.html241.jpeg b/doc/schema/images/kiwi.html241.jpeg
index 7b26cd9..58c6479 100644
Binary files a/doc/schema/images/kiwi.html241.jpeg and b/doc/schema/images/kiwi.html241.jpeg differ
diff --git a/doc/schema/images/kiwi.html242.jpeg b/doc/schema/images/kiwi.html242.jpeg
index bf8aa6d..244ff2a 100644
Binary files a/doc/schema/images/kiwi.html242.jpeg and b/doc/schema/images/kiwi.html242.jpeg differ
diff --git a/doc/schema/images/kiwi.html243.jpeg b/doc/schema/images/kiwi.html243.jpeg
index 02b6f10..3c0d0b3 100644
Binary files a/doc/schema/images/kiwi.html243.jpeg and b/doc/schema/images/kiwi.html243.jpeg differ
diff --git a/doc/schema/images/kiwi.html244.jpeg b/doc/schema/images/kiwi.html244.jpeg
index a9d759b..f70f61c 100644
Binary files a/doc/schema/images/kiwi.html244.jpeg and b/doc/schema/images/kiwi.html244.jpeg differ
diff --git a/doc/schema/images/kiwi.html245.jpeg b/doc/schema/images/kiwi.html245.jpeg
index 6e530a3..eff1848 100644
Binary files a/doc/schema/images/kiwi.html245.jpeg and b/doc/schema/images/kiwi.html245.jpeg differ
diff --git a/doc/schema/images/kiwi.html246.jpeg b/doc/schema/images/kiwi.html246.jpeg
index dc0f413..5a197aa 100644
Binary files a/doc/schema/images/kiwi.html246.jpeg and b/doc/schema/images/kiwi.html246.jpeg differ
diff --git a/doc/schema/images/kiwi.html247.jpeg b/doc/schema/images/kiwi.html247.jpeg
index 452f3e7..aa2627d 100644
Binary files a/doc/schema/images/kiwi.html247.jpeg and b/doc/schema/images/kiwi.html247.jpeg differ
diff --git a/doc/schema/images/kiwi.html248.jpeg b/doc/schema/images/kiwi.html248.jpeg
index c773d56..3369b2a 100644
Binary files a/doc/schema/images/kiwi.html248.jpeg and b/doc/schema/images/kiwi.html248.jpeg differ
diff --git a/doc/schema/images/kiwi.html249.jpeg b/doc/schema/images/kiwi.html249.jpeg
index bd432f5..5371e14 100644
Binary files a/doc/schema/images/kiwi.html249.jpeg and b/doc/schema/images/kiwi.html249.jpeg differ
diff --git a/doc/schema/images/kiwi.html25.jpeg b/doc/schema/images/kiwi.html25.jpeg
index 6ad3f99..11e81c3 100644
Binary files a/doc/schema/images/kiwi.html25.jpeg and b/doc/schema/images/kiwi.html25.jpeg differ
diff --git a/doc/schema/images/kiwi.html250.jpeg b/doc/schema/images/kiwi.html250.jpeg
index 269610f..8ec1378 100644
Binary files a/doc/schema/images/kiwi.html250.jpeg and b/doc/schema/images/kiwi.html250.jpeg differ
diff --git a/doc/schema/images/kiwi.html251.jpeg b/doc/schema/images/kiwi.html251.jpeg
index 09c0819..5a77939 100644
Binary files a/doc/schema/images/kiwi.html251.jpeg and b/doc/schema/images/kiwi.html251.jpeg differ
diff --git a/doc/schema/images/kiwi.html252.jpeg b/doc/schema/images/kiwi.html252.jpeg
index 5406aa3..2ffaf99 100644
Binary files a/doc/schema/images/kiwi.html252.jpeg and b/doc/schema/images/kiwi.html252.jpeg differ
diff --git a/doc/schema/images/kiwi.html253.jpeg b/doc/schema/images/kiwi.html253.jpeg
index 0478571..81f708b 100644
Binary files a/doc/schema/images/kiwi.html253.jpeg and b/doc/schema/images/kiwi.html253.jpeg differ
diff --git a/doc/schema/images/kiwi.html254.jpeg b/doc/schema/images/kiwi.html254.jpeg
index eaacf48..dfffdcc 100644
Binary files a/doc/schema/images/kiwi.html254.jpeg and b/doc/schema/images/kiwi.html254.jpeg differ
diff --git a/doc/schema/images/kiwi.html255.jpeg b/doc/schema/images/kiwi.html255.jpeg
index 8e6a0ed..8daa6fc 100644
Binary files a/doc/schema/images/kiwi.html255.jpeg and b/doc/schema/images/kiwi.html255.jpeg differ
diff --git a/doc/schema/images/kiwi.html256.jpeg b/doc/schema/images/kiwi.html256.jpeg
index af34e84..8b8a73d 100644
Binary files a/doc/schema/images/kiwi.html256.jpeg and b/doc/schema/images/kiwi.html256.jpeg differ
diff --git a/doc/schema/images/kiwi.html257.jpeg b/doc/schema/images/kiwi.html257.jpeg
index fd583c6..3ff44e8 100644
Binary files a/doc/schema/images/kiwi.html257.jpeg and b/doc/schema/images/kiwi.html257.jpeg differ
diff --git a/doc/schema/images/kiwi.html258.jpeg b/doc/schema/images/kiwi.html258.jpeg
index 974ca11..c8cf852 100644
Binary files a/doc/schema/images/kiwi.html258.jpeg and b/doc/schema/images/kiwi.html258.jpeg differ
diff --git a/doc/schema/images/kiwi.html259.jpeg b/doc/schema/images/kiwi.html259.jpeg
index a451848..52ec718 100644
Binary files a/doc/schema/images/kiwi.html259.jpeg and b/doc/schema/images/kiwi.html259.jpeg differ
diff --git a/doc/schema/images/kiwi.html26.jpeg b/doc/schema/images/kiwi.html26.jpeg
index bcd640e..e018935 100644
Binary files a/doc/schema/images/kiwi.html26.jpeg and b/doc/schema/images/kiwi.html26.jpeg differ
diff --git a/doc/schema/images/kiwi.html260.jpeg b/doc/schema/images/kiwi.html260.jpeg
index dd7ef29..1d94eb6 100644
Binary files a/doc/schema/images/kiwi.html260.jpeg and b/doc/schema/images/kiwi.html260.jpeg differ
diff --git a/doc/schema/images/kiwi.html261.jpeg b/doc/schema/images/kiwi.html261.jpeg
index 7a21907..f3b7c57 100644
Binary files a/doc/schema/images/kiwi.html261.jpeg and b/doc/schema/images/kiwi.html261.jpeg differ
diff --git a/doc/schema/images/kiwi.html262.jpeg b/doc/schema/images/kiwi.html262.jpeg
index 346981b..b1e8b38 100644
Binary files a/doc/schema/images/kiwi.html262.jpeg and b/doc/schema/images/kiwi.html262.jpeg differ
diff --git a/doc/schema/images/kiwi.html263.jpeg b/doc/schema/images/kiwi.html263.jpeg
index 5c1224a..6372b0b 100644
Binary files a/doc/schema/images/kiwi.html263.jpeg and b/doc/schema/images/kiwi.html263.jpeg differ
diff --git a/doc/schema/images/kiwi.html264.jpeg b/doc/schema/images/kiwi.html264.jpeg
index fb5aba6..23503af 100644
Binary files a/doc/schema/images/kiwi.html264.jpeg and b/doc/schema/images/kiwi.html264.jpeg differ
diff --git a/doc/schema/images/kiwi.html265.jpeg b/doc/schema/images/kiwi.html265.jpeg
index cc7333c..b996551 100644
Binary files a/doc/schema/images/kiwi.html265.jpeg and b/doc/schema/images/kiwi.html265.jpeg differ
diff --git a/doc/schema/images/kiwi.html266.jpeg b/doc/schema/images/kiwi.html266.jpeg
index ea7550e..a1ad87c 100644
Binary files a/doc/schema/images/kiwi.html266.jpeg and b/doc/schema/images/kiwi.html266.jpeg differ
diff --git a/doc/schema/images/kiwi.html267.jpeg b/doc/schema/images/kiwi.html267.jpeg
index bc93e9a..004cd24 100644
Binary files a/doc/schema/images/kiwi.html267.jpeg and b/doc/schema/images/kiwi.html267.jpeg differ
diff --git a/doc/schema/images/kiwi.html269.jpeg b/doc/schema/images/kiwi.html269.jpeg
index d62d64a..2a7f375 100644
Binary files a/doc/schema/images/kiwi.html269.jpeg and b/doc/schema/images/kiwi.html269.jpeg differ
diff --git a/doc/schema/images/kiwi.html27.jpeg b/doc/schema/images/kiwi.html27.jpeg
index c6493b1..b4e18a6 100644
Binary files a/doc/schema/images/kiwi.html27.jpeg and b/doc/schema/images/kiwi.html27.jpeg differ
diff --git a/doc/schema/images/kiwi.html270.jpeg b/doc/schema/images/kiwi.html270.jpeg
index 3e8ff8e..ed16df1 100644
Binary files a/doc/schema/images/kiwi.html270.jpeg and b/doc/schema/images/kiwi.html270.jpeg differ
diff --git a/doc/schema/images/kiwi.html271.jpeg b/doc/schema/images/kiwi.html271.jpeg
index d661852..fc89d48 100644
Binary files a/doc/schema/images/kiwi.html271.jpeg and b/doc/schema/images/kiwi.html271.jpeg differ
diff --git a/doc/schema/images/kiwi.html272.jpeg b/doc/schema/images/kiwi.html272.jpeg
index d7fc19d..8d6694d 100644
Binary files a/doc/schema/images/kiwi.html272.jpeg and b/doc/schema/images/kiwi.html272.jpeg differ
diff --git a/doc/schema/images/kiwi.html273.jpeg b/doc/schema/images/kiwi.html273.jpeg
index 6daae98..3372739 100644
Binary files a/doc/schema/images/kiwi.html273.jpeg and b/doc/schema/images/kiwi.html273.jpeg differ
diff --git a/doc/schema/images/kiwi.html274.jpeg b/doc/schema/images/kiwi.html274.jpeg
index 743cffc..c8fefbd 100644
Binary files a/doc/schema/images/kiwi.html274.jpeg and b/doc/schema/images/kiwi.html274.jpeg differ
diff --git a/doc/schema/images/kiwi.html275.jpeg b/doc/schema/images/kiwi.html275.jpeg
index e73437e..3c528ce 100644
Binary files a/doc/schema/images/kiwi.html275.jpeg and b/doc/schema/images/kiwi.html275.jpeg differ
diff --git a/doc/schema/images/kiwi.html276.jpeg b/doc/schema/images/kiwi.html276.jpeg
index fd4479a..09bec23 100644
Binary files a/doc/schema/images/kiwi.html276.jpeg and b/doc/schema/images/kiwi.html276.jpeg differ
diff --git a/doc/schema/images/kiwi.html277.jpeg b/doc/schema/images/kiwi.html277.jpeg
index c1e35e6..b3dcea9 100644
Binary files a/doc/schema/images/kiwi.html277.jpeg and b/doc/schema/images/kiwi.html277.jpeg differ
diff --git a/doc/schema/images/kiwi.html278.jpeg b/doc/schema/images/kiwi.html278.jpeg
index 0d2c787..dd52a63 100644
Binary files a/doc/schema/images/kiwi.html278.jpeg and b/doc/schema/images/kiwi.html278.jpeg differ
diff --git a/doc/schema/images/kiwi.html279.jpeg b/doc/schema/images/kiwi.html279.jpeg
index 70f000a..60b18ec 100644
Binary files a/doc/schema/images/kiwi.html279.jpeg and b/doc/schema/images/kiwi.html279.jpeg differ
diff --git a/doc/schema/images/kiwi.html28.jpeg b/doc/schema/images/kiwi.html28.jpeg
index 5054e1a..f2277a1 100644
Binary files a/doc/schema/images/kiwi.html28.jpeg and b/doc/schema/images/kiwi.html28.jpeg differ
diff --git a/doc/schema/images/kiwi.html280.jpeg b/doc/schema/images/kiwi.html280.jpeg
index 91ea357..996ba41 100644
Binary files a/doc/schema/images/kiwi.html280.jpeg and b/doc/schema/images/kiwi.html280.jpeg differ
diff --git a/doc/schema/images/kiwi.html281.jpeg b/doc/schema/images/kiwi.html281.jpeg
index a64181f..46627eb 100644
Binary files a/doc/schema/images/kiwi.html281.jpeg and b/doc/schema/images/kiwi.html281.jpeg differ
diff --git a/doc/schema/images/kiwi.html282.jpeg b/doc/schema/images/kiwi.html282.jpeg
index a6c0cc9..b7d6db1 100644
Binary files a/doc/schema/images/kiwi.html282.jpeg and b/doc/schema/images/kiwi.html282.jpeg differ
diff --git a/doc/schema/images/kiwi.html283.jpeg b/doc/schema/images/kiwi.html283.jpeg
index 174ed70..9152773 100644
Binary files a/doc/schema/images/kiwi.html283.jpeg and b/doc/schema/images/kiwi.html283.jpeg differ
diff --git a/doc/schema/images/kiwi.html284.jpeg b/doc/schema/images/kiwi.html284.jpeg
index 627b796..ec4254a 100644
Binary files a/doc/schema/images/kiwi.html284.jpeg and b/doc/schema/images/kiwi.html284.jpeg differ
diff --git a/doc/schema/images/kiwi.html285.jpeg b/doc/schema/images/kiwi.html285.jpeg
index 81d501d..4b6c5e0 100644
Binary files a/doc/schema/images/kiwi.html285.jpeg and b/doc/schema/images/kiwi.html285.jpeg differ
diff --git a/doc/schema/images/kiwi.html286.jpeg b/doc/schema/images/kiwi.html286.jpeg
index ea1f6c2..07485ea 100644
Binary files a/doc/schema/images/kiwi.html286.jpeg and b/doc/schema/images/kiwi.html286.jpeg differ
diff --git a/doc/schema/images/kiwi.html287.jpeg b/doc/schema/images/kiwi.html287.jpeg
index 5d0a325..ec10eb0 100644
Binary files a/doc/schema/images/kiwi.html287.jpeg and b/doc/schema/images/kiwi.html287.jpeg differ
diff --git a/doc/schema/images/kiwi.html29.jpeg b/doc/schema/images/kiwi.html29.jpeg
index ad217fa..a522218 100644
Binary files a/doc/schema/images/kiwi.html29.jpeg and b/doc/schema/images/kiwi.html29.jpeg differ
diff --git a/doc/schema/images/kiwi.html3.jpeg b/doc/schema/images/kiwi.html3.jpeg
index cd0e577..6a949ea 100644
Binary files a/doc/schema/images/kiwi.html3.jpeg and b/doc/schema/images/kiwi.html3.jpeg differ
diff --git a/doc/schema/images/kiwi.html30.jpeg b/doc/schema/images/kiwi.html30.jpeg
index 62816df..2b4c2d0 100644
Binary files a/doc/schema/images/kiwi.html30.jpeg and b/doc/schema/images/kiwi.html30.jpeg differ
diff --git a/doc/schema/images/kiwi.html31.jpeg b/doc/schema/images/kiwi.html31.jpeg
index 5080503..441031b 100644
Binary files a/doc/schema/images/kiwi.html31.jpeg and b/doc/schema/images/kiwi.html31.jpeg differ
diff --git a/doc/schema/images/kiwi.html32.jpeg b/doc/schema/images/kiwi.html32.jpeg
index 206da7f..7dd4df1 100644
Binary files a/doc/schema/images/kiwi.html32.jpeg and b/doc/schema/images/kiwi.html32.jpeg differ
diff --git a/doc/schema/images/kiwi.html33.jpeg b/doc/schema/images/kiwi.html33.jpeg
index d4456e4..d996a02 100644
Binary files a/doc/schema/images/kiwi.html33.jpeg and b/doc/schema/images/kiwi.html33.jpeg differ
diff --git a/doc/schema/images/kiwi.html34.jpeg b/doc/schema/images/kiwi.html34.jpeg
index c1739d9..7bbefa3 100644
Binary files a/doc/schema/images/kiwi.html34.jpeg and b/doc/schema/images/kiwi.html34.jpeg differ
diff --git a/doc/schema/images/kiwi.html35.jpeg b/doc/schema/images/kiwi.html35.jpeg
index fd89432..62ec9ee 100644
Binary files a/doc/schema/images/kiwi.html35.jpeg and b/doc/schema/images/kiwi.html35.jpeg differ
diff --git a/doc/schema/images/kiwi.html36.jpeg b/doc/schema/images/kiwi.html36.jpeg
index 5b36e45..6aa4ad9 100644
Binary files a/doc/schema/images/kiwi.html36.jpeg and b/doc/schema/images/kiwi.html36.jpeg differ
diff --git a/doc/schema/images/kiwi.html37.jpeg b/doc/schema/images/kiwi.html37.jpeg
index afd627c..2da87b2 100644
Binary files a/doc/schema/images/kiwi.html37.jpeg and b/doc/schema/images/kiwi.html37.jpeg differ
diff --git a/doc/schema/images/kiwi.html38.jpeg b/doc/schema/images/kiwi.html38.jpeg
index fc737fd..9c67815 100644
Binary files a/doc/schema/images/kiwi.html38.jpeg and b/doc/schema/images/kiwi.html38.jpeg differ
diff --git a/doc/schema/images/kiwi.html39.jpeg b/doc/schema/images/kiwi.html39.jpeg
index 3adf84b..04be932 100644
Binary files a/doc/schema/images/kiwi.html39.jpeg and b/doc/schema/images/kiwi.html39.jpeg differ
diff --git a/doc/schema/images/kiwi.html4.jpeg b/doc/schema/images/kiwi.html4.jpeg
index d3441cd..d546eb0 100644
Binary files a/doc/schema/images/kiwi.html4.jpeg and b/doc/schema/images/kiwi.html4.jpeg differ
diff --git a/doc/schema/images/kiwi.html40.jpeg b/doc/schema/images/kiwi.html40.jpeg
index 53b911e..038f2c2 100644
Binary files a/doc/schema/images/kiwi.html40.jpeg and b/doc/schema/images/kiwi.html40.jpeg differ
diff --git a/doc/schema/images/kiwi.html41.jpeg b/doc/schema/images/kiwi.html41.jpeg
index 028683b..9852db0 100644
Binary files a/doc/schema/images/kiwi.html41.jpeg and b/doc/schema/images/kiwi.html41.jpeg differ
diff --git a/doc/schema/images/kiwi.html42.jpeg b/doc/schema/images/kiwi.html42.jpeg
index 5f89606..6f84a08 100644
Binary files a/doc/schema/images/kiwi.html42.jpeg and b/doc/schema/images/kiwi.html42.jpeg differ
diff --git a/doc/schema/images/kiwi.html43.jpeg b/doc/schema/images/kiwi.html43.jpeg
index 0ca777d..adc7653 100644
Binary files a/doc/schema/images/kiwi.html43.jpeg and b/doc/schema/images/kiwi.html43.jpeg differ
diff --git a/doc/schema/images/kiwi.html44.jpeg b/doc/schema/images/kiwi.html44.jpeg
index e8f8e49..475bd70 100644
Binary files a/doc/schema/images/kiwi.html44.jpeg and b/doc/schema/images/kiwi.html44.jpeg differ
diff --git a/doc/schema/images/kiwi.html45.jpeg b/doc/schema/images/kiwi.html45.jpeg
index 631e78d..b939d03 100644
Binary files a/doc/schema/images/kiwi.html45.jpeg and b/doc/schema/images/kiwi.html45.jpeg differ
diff --git a/doc/schema/images/kiwi.html46.jpeg b/doc/schema/images/kiwi.html46.jpeg
index c586fa3..59fb830 100644
Binary files a/doc/schema/images/kiwi.html46.jpeg and b/doc/schema/images/kiwi.html46.jpeg differ
diff --git a/doc/schema/images/kiwi.html47.jpeg b/doc/schema/images/kiwi.html47.jpeg
index 427451a..3a04457 100644
Binary files a/doc/schema/images/kiwi.html47.jpeg and b/doc/schema/images/kiwi.html47.jpeg differ
diff --git a/doc/schema/images/kiwi.html48.jpeg b/doc/schema/images/kiwi.html48.jpeg
index f113042..2db7652 100644
Binary files a/doc/schema/images/kiwi.html48.jpeg and b/doc/schema/images/kiwi.html48.jpeg differ
diff --git a/doc/schema/images/kiwi.html49.jpeg b/doc/schema/images/kiwi.html49.jpeg
index bdba45a..08ef583 100644
Binary files a/doc/schema/images/kiwi.html49.jpeg and b/doc/schema/images/kiwi.html49.jpeg differ
diff --git a/doc/schema/images/kiwi.html5.jpeg b/doc/schema/images/kiwi.html5.jpeg
index 128aaa8..c203dc5 100644
Binary files a/doc/schema/images/kiwi.html5.jpeg and b/doc/schema/images/kiwi.html5.jpeg differ
diff --git a/doc/schema/images/kiwi.html50.jpeg b/doc/schema/images/kiwi.html50.jpeg
index 912fe4f..f0b1eba 100644
Binary files a/doc/schema/images/kiwi.html50.jpeg and b/doc/schema/images/kiwi.html50.jpeg differ
diff --git a/doc/schema/images/kiwi.html51.jpeg b/doc/schema/images/kiwi.html51.jpeg
index 280cce5..ca3f1dc 100644
Binary files a/doc/schema/images/kiwi.html51.jpeg and b/doc/schema/images/kiwi.html51.jpeg differ
diff --git a/doc/schema/images/kiwi.html52.jpeg b/doc/schema/images/kiwi.html52.jpeg
index 4ded394..6d50df0 100644
Binary files a/doc/schema/images/kiwi.html52.jpeg and b/doc/schema/images/kiwi.html52.jpeg differ
diff --git a/doc/schema/images/kiwi.html53.jpeg b/doc/schema/images/kiwi.html53.jpeg
index 80f0d7a..d7f563e 100644
Binary files a/doc/schema/images/kiwi.html53.jpeg and b/doc/schema/images/kiwi.html53.jpeg differ
diff --git a/doc/schema/images/kiwi.html54.jpeg b/doc/schema/images/kiwi.html54.jpeg
index d1c8fd3..4dffa2c 100644
Binary files a/doc/schema/images/kiwi.html54.jpeg and b/doc/schema/images/kiwi.html54.jpeg differ
diff --git a/doc/schema/images/kiwi.html55.jpeg b/doc/schema/images/kiwi.html55.jpeg
index 8b47fcf..5dcfd76 100644
Binary files a/doc/schema/images/kiwi.html55.jpeg and b/doc/schema/images/kiwi.html55.jpeg differ
diff --git a/doc/schema/images/kiwi.html56.jpeg b/doc/schema/images/kiwi.html56.jpeg
index 366479f..a426314 100644
Binary files a/doc/schema/images/kiwi.html56.jpeg and b/doc/schema/images/kiwi.html56.jpeg differ
diff --git a/doc/schema/images/kiwi.html57.jpeg b/doc/schema/images/kiwi.html57.jpeg
index feb87c1..a5f1496 100644
Binary files a/doc/schema/images/kiwi.html57.jpeg and b/doc/schema/images/kiwi.html57.jpeg differ
diff --git a/doc/schema/images/kiwi.html58.jpeg b/doc/schema/images/kiwi.html58.jpeg
index a44d797..22a2504 100644
Binary files a/doc/schema/images/kiwi.html58.jpeg and b/doc/schema/images/kiwi.html58.jpeg differ
diff --git a/doc/schema/images/kiwi.html59.jpeg b/doc/schema/images/kiwi.html59.jpeg
index 2e4dd14..853caca 100644
Binary files a/doc/schema/images/kiwi.html59.jpeg and b/doc/schema/images/kiwi.html59.jpeg differ
diff --git a/doc/schema/images/kiwi.html6.jpeg b/doc/schema/images/kiwi.html6.jpeg
index 09a7d02..71c2594 100644
Binary files a/doc/schema/images/kiwi.html6.jpeg and b/doc/schema/images/kiwi.html6.jpeg differ
diff --git a/doc/schema/images/kiwi.html60.jpeg b/doc/schema/images/kiwi.html60.jpeg
index b3dcea9..b4d155e 100644
Binary files a/doc/schema/images/kiwi.html60.jpeg and b/doc/schema/images/kiwi.html60.jpeg differ
diff --git a/doc/schema/images/kiwi.html61.jpeg b/doc/schema/images/kiwi.html61.jpeg
index a4efcae..6c9acda 100644
Binary files a/doc/schema/images/kiwi.html61.jpeg and b/doc/schema/images/kiwi.html61.jpeg differ
diff --git a/doc/schema/images/kiwi.html62.jpeg b/doc/schema/images/kiwi.html62.jpeg
index 411b954..85f2595 100644
Binary files a/doc/schema/images/kiwi.html62.jpeg and b/doc/schema/images/kiwi.html62.jpeg differ
diff --git a/doc/schema/images/kiwi.html63.jpeg b/doc/schema/images/kiwi.html63.jpeg
index 18e3066..04c6ee7 100644
Binary files a/doc/schema/images/kiwi.html63.jpeg and b/doc/schema/images/kiwi.html63.jpeg differ
diff --git a/doc/schema/images/kiwi.html64.jpeg b/doc/schema/images/kiwi.html64.jpeg
index 0117363..32a0eeb 100644
Binary files a/doc/schema/images/kiwi.html64.jpeg and b/doc/schema/images/kiwi.html64.jpeg differ
diff --git a/doc/schema/images/kiwi.html65.jpeg b/doc/schema/images/kiwi.html65.jpeg
index 99d478f..f4a1abf 100644
Binary files a/doc/schema/images/kiwi.html65.jpeg and b/doc/schema/images/kiwi.html65.jpeg differ
diff --git a/doc/schema/images/kiwi.html66.jpeg b/doc/schema/images/kiwi.html66.jpeg
index baecb3e..7fac80f 100644
Binary files a/doc/schema/images/kiwi.html66.jpeg and b/doc/schema/images/kiwi.html66.jpeg differ
diff --git a/doc/schema/images/kiwi.html67.jpeg b/doc/schema/images/kiwi.html67.jpeg
index cae5629..730a001 100644
Binary files a/doc/schema/images/kiwi.html67.jpeg and b/doc/schema/images/kiwi.html67.jpeg differ
diff --git a/doc/schema/images/kiwi.html68.jpeg b/doc/schema/images/kiwi.html68.jpeg
index 6d5f9e9..01b2d54 100644
Binary files a/doc/schema/images/kiwi.html68.jpeg and b/doc/schema/images/kiwi.html68.jpeg differ
diff --git a/doc/schema/images/kiwi.html69.jpeg b/doc/schema/images/kiwi.html69.jpeg
index 13fe82c..81edf78 100644
Binary files a/doc/schema/images/kiwi.html69.jpeg and b/doc/schema/images/kiwi.html69.jpeg differ
diff --git a/doc/schema/images/kiwi.html7.jpeg b/doc/schema/images/kiwi.html7.jpeg
index 102b326..43b94bd 100644
Binary files a/doc/schema/images/kiwi.html7.jpeg and b/doc/schema/images/kiwi.html7.jpeg differ
diff --git a/doc/schema/images/kiwi.html70.jpeg b/doc/schema/images/kiwi.html70.jpeg
index a14d46e..a44ed76 100644
Binary files a/doc/schema/images/kiwi.html70.jpeg and b/doc/schema/images/kiwi.html70.jpeg differ
diff --git a/doc/schema/images/kiwi.html71.jpeg b/doc/schema/images/kiwi.html71.jpeg
index 2084c90..2a72f2d 100644
Binary files a/doc/schema/images/kiwi.html71.jpeg and b/doc/schema/images/kiwi.html71.jpeg differ
diff --git a/doc/schema/images/kiwi.html72.jpeg b/doc/schema/images/kiwi.html72.jpeg
index 792ad6d..23e0e6e 100644
Binary files a/doc/schema/images/kiwi.html72.jpeg and b/doc/schema/images/kiwi.html72.jpeg differ
diff --git a/doc/schema/images/kiwi.html73.jpeg b/doc/schema/images/kiwi.html73.jpeg
index ac1e6e1..ad0912a 100644
Binary files a/doc/schema/images/kiwi.html73.jpeg and b/doc/schema/images/kiwi.html73.jpeg differ
diff --git a/doc/schema/images/kiwi.html74.jpeg b/doc/schema/images/kiwi.html74.jpeg
index 3449727..a49c9f7 100644
Binary files a/doc/schema/images/kiwi.html74.jpeg and b/doc/schema/images/kiwi.html74.jpeg differ
diff --git a/doc/schema/images/kiwi.html75.jpeg b/doc/schema/images/kiwi.html75.jpeg
index 663af59..498254d 100644
Binary files a/doc/schema/images/kiwi.html75.jpeg and b/doc/schema/images/kiwi.html75.jpeg differ
diff --git a/doc/schema/images/kiwi.html76.jpeg b/doc/schema/images/kiwi.html76.jpeg
index 0abf37e..180ce75 100644
Binary files a/doc/schema/images/kiwi.html76.jpeg and b/doc/schema/images/kiwi.html76.jpeg differ
diff --git a/doc/schema/images/kiwi.html77.jpeg b/doc/schema/images/kiwi.html77.jpeg
index b1de8da..1b84399 100644
Binary files a/doc/schema/images/kiwi.html77.jpeg and b/doc/schema/images/kiwi.html77.jpeg differ
diff --git a/doc/schema/images/kiwi.html78.jpeg b/doc/schema/images/kiwi.html78.jpeg
index 02d6e01..7c9bd51 100644
Binary files a/doc/schema/images/kiwi.html78.jpeg and b/doc/schema/images/kiwi.html78.jpeg differ
diff --git a/doc/schema/images/kiwi.html79.jpeg b/doc/schema/images/kiwi.html79.jpeg
index e4f7b37..d35820d 100644
Binary files a/doc/schema/images/kiwi.html79.jpeg and b/doc/schema/images/kiwi.html79.jpeg differ
diff --git a/doc/schema/images/kiwi.html8.jpeg b/doc/schema/images/kiwi.html8.jpeg
index 60d0f5b..d4c2fc2 100644
Binary files a/doc/schema/images/kiwi.html8.jpeg and b/doc/schema/images/kiwi.html8.jpeg differ
diff --git a/doc/schema/images/kiwi.html80.jpeg b/doc/schema/images/kiwi.html80.jpeg
index e97bd78..021dfca 100644
Binary files a/doc/schema/images/kiwi.html80.jpeg and b/doc/schema/images/kiwi.html80.jpeg differ
diff --git a/doc/schema/images/kiwi.html81.jpeg b/doc/schema/images/kiwi.html81.jpeg
index 943c288..58dd0b3 100644
Binary files a/doc/schema/images/kiwi.html81.jpeg and b/doc/schema/images/kiwi.html81.jpeg differ
diff --git a/doc/schema/images/kiwi.html82.jpeg b/doc/schema/images/kiwi.html82.jpeg
index 540070b..73fbeef 100644
Binary files a/doc/schema/images/kiwi.html82.jpeg and b/doc/schema/images/kiwi.html82.jpeg differ
diff --git a/doc/schema/images/kiwi.html83.jpeg b/doc/schema/images/kiwi.html83.jpeg
index b3e1511..c10509e 100644
Binary files a/doc/schema/images/kiwi.html83.jpeg and b/doc/schema/images/kiwi.html83.jpeg differ
diff --git a/doc/schema/images/kiwi.html84.jpeg b/doc/schema/images/kiwi.html84.jpeg
index d891d9a..58f32f8 100644
Binary files a/doc/schema/images/kiwi.html84.jpeg and b/doc/schema/images/kiwi.html84.jpeg differ
diff --git a/doc/schema/images/kiwi.html85.jpeg b/doc/schema/images/kiwi.html85.jpeg
index 5307740..d81a6a9 100644
Binary files a/doc/schema/images/kiwi.html85.jpeg and b/doc/schema/images/kiwi.html85.jpeg differ
diff --git a/doc/schema/images/kiwi.html86.jpeg b/doc/schema/images/kiwi.html86.jpeg
index 1b3a8ba..6fdd814 100644
Binary files a/doc/schema/images/kiwi.html86.jpeg and b/doc/schema/images/kiwi.html86.jpeg differ
diff --git a/doc/schema/images/kiwi.html87.jpeg b/doc/schema/images/kiwi.html87.jpeg
index 589c239..2dee113 100644
Binary files a/doc/schema/images/kiwi.html87.jpeg and b/doc/schema/images/kiwi.html87.jpeg differ
diff --git a/doc/schema/images/kiwi.html88.jpeg b/doc/schema/images/kiwi.html88.jpeg
index d4efa54..a650c20 100644
Binary files a/doc/schema/images/kiwi.html88.jpeg and b/doc/schema/images/kiwi.html88.jpeg differ
diff --git a/doc/schema/images/kiwi.html89.jpeg b/doc/schema/images/kiwi.html89.jpeg
index e8fbccf..121f206 100644
Binary files a/doc/schema/images/kiwi.html89.jpeg and b/doc/schema/images/kiwi.html89.jpeg differ
diff --git a/doc/schema/images/kiwi.html9.jpeg b/doc/schema/images/kiwi.html9.jpeg
index 3adcec7..3bd5f2c 100644
Binary files a/doc/schema/images/kiwi.html9.jpeg and b/doc/schema/images/kiwi.html9.jpeg differ
diff --git a/doc/schema/images/kiwi.html90.jpeg b/doc/schema/images/kiwi.html90.jpeg
index 7b4cd1a..24d52cf 100644
Binary files a/doc/schema/images/kiwi.html90.jpeg and b/doc/schema/images/kiwi.html90.jpeg differ
diff --git a/doc/schema/images/kiwi.html91.jpeg b/doc/schema/images/kiwi.html91.jpeg
index bd4c3b2..002a3c4 100644
Binary files a/doc/schema/images/kiwi.html91.jpeg and b/doc/schema/images/kiwi.html91.jpeg differ
diff --git a/doc/schema/images/kiwi.html92.jpeg b/doc/schema/images/kiwi.html92.jpeg
index 5c03a55..b31d698 100644
Binary files a/doc/schema/images/kiwi.html92.jpeg and b/doc/schema/images/kiwi.html92.jpeg differ
diff --git a/doc/schema/images/kiwi.html93.jpeg b/doc/schema/images/kiwi.html93.jpeg
index e97c9fa..ace4a68 100644
Binary files a/doc/schema/images/kiwi.html93.jpeg and b/doc/schema/images/kiwi.html93.jpeg differ
diff --git a/doc/schema/images/kiwi.html94.jpeg b/doc/schema/images/kiwi.html94.jpeg
index 0f8a66e..c578dd5 100644
Binary files a/doc/schema/images/kiwi.html94.jpeg and b/doc/schema/images/kiwi.html94.jpeg differ
diff --git a/doc/schema/images/kiwi.html95.jpeg b/doc/schema/images/kiwi.html95.jpeg
index a396cd7..af3236b 100644
Binary files a/doc/schema/images/kiwi.html95.jpeg and b/doc/schema/images/kiwi.html95.jpeg differ
diff --git a/doc/schema/images/kiwi.html96.jpeg b/doc/schema/images/kiwi.html96.jpeg
index 6401871..34dbf5a 100644
Binary files a/doc/schema/images/kiwi.html96.jpeg and b/doc/schema/images/kiwi.html96.jpeg differ
diff --git a/doc/schema/images/kiwi.html97.jpeg b/doc/schema/images/kiwi.html97.jpeg
index affe60d..27906bc 100644
Binary files a/doc/schema/images/kiwi.html97.jpeg and b/doc/schema/images/kiwi.html97.jpeg differ
diff --git a/doc/schema/images/kiwi.html98.jpeg b/doc/schema/images/kiwi.html98.jpeg
index 11434ae..fef8d96 100644
Binary files a/doc/schema/images/kiwi.html98.jpeg and b/doc/schema/images/kiwi.html98.jpeg differ
diff --git a/doc/schema/images/kiwi.html99.jpeg b/doc/schema/images/kiwi.html99.jpeg
index ff10de1..871b687 100644
Binary files a/doc/schema/images/kiwi.html99.jpeg and b/doc/schema/images/kiwi.html99.jpeg differ
diff --git a/doc/schema/kiwi0.html b/doc/schema/kiwi0.html
index 04b5858..17a24e6 100644
--- a/doc/schema/kiwi0.html
+++ b/doc/schema/kiwi0.html
@@ -7,12 +7,11 @@
       <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
          <!--
         var propertiesBoxes= new Array('properties_id0', 
-				'properties_id27', 
 				'properties_id28', 
 				'properties_id29', 
 				'properties_id30', 
 				'properties_id31', 
-				'properties_id35', 
+				'properties_id32', 
 				'properties_id36', 
 				'properties_id37', 
 				'properties_id38', 
@@ -20,278 +19,279 @@
 				'properties_id40', 
 				'properties_id41', 
 				'properties_id42', 
-				'properties_id50', 
+				'properties_id43', 
 				'properties_id51', 
 				'properties_id52', 
-				'properties_id54', 
-				'properties_id56', 
-				'properties_id58', 
+				'properties_id53', 
+				'properties_id55', 
+				'properties_id57', 
 				'properties_id59', 
-				'properties_id61', 
+				'properties_id60', 
 				'properties_id62', 
-				'properties_id64', 
+				'properties_id63', 
 				'properties_id65', 
-				'properties_id67', 
-				'properties_id69', 
-				'properties_id71', 
+				'properties_id66', 
+				'properties_id68', 
+				'properties_id70', 
 				'properties_id72', 
-				'properties_id73', 
 				'properties_id74', 
 				'properties_id75', 
 				'properties_id76', 
-				'properties_id87', 
-				'properties_id95', 
-				'properties_id107', 
-				'properties_id111', 
-				'properties_id112', 
-				'properties_id113', 
+				'properties_id77', 
+				'properties_id78', 
+				'properties_id79', 
+				'properties_id90', 
+				'properties_id98', 
+				'properties_id110', 
+				'properties_id114', 
+				'properties_id115', 
 				'properties_id116', 
-				'properties_id120', 
 				'properties_id121', 
-				'properties_id122', 
-				'properties_id130', 
-				'properties_id136', 
-				'properties_id149', 
-				'properties_id150', 
-				'properties_id154', 
+				'properties_id125', 
+				'properties_id126', 
+				'properties_id127', 
+				'properties_id134', 
+				'properties_id141', 
+				'properties_id179', 
+				'properties_id180', 
+				'properties_id182', 
+				'properties_id184', 
 				'properties_id186', 
-				'properties_id187', 
+				'properties_id188', 
 				'properties_id189', 
+				'properties_id190', 
 				'properties_id191', 
+				'properties_id192', 
 				'properties_id193', 
-				'properties_id195', 
-				'properties_id196', 
+				'properties_id194', 
 				'properties_id197', 
 				'properties_id198', 
-				'properties_id199', 
-				'properties_id200', 
-				'properties_id201', 
 				'properties_id204', 
 				'properties_id205', 
-				'properties_id211', 
-				'properties_id212', 
+				'properties_id206', 
 				'properties_id213', 
+				'properties_id217', 
+				'properties_id218', 
 				'properties_id220', 
+				'properties_id222', 
 				'properties_id224', 
-				'properties_id225', 
-				'properties_id227', 
-				'properties_id229', 
-				'properties_id231', 
-				'properties_id233', 
-				'properties_id246', 
-				'properties_id247', 
-				'properties_id258', 
-				'properties_id267', 
-				'properties_id270', 
-				'properties_id271', 
-				'properties_id272', 
-				'properties_id288', 
-				'properties_id293', 
-				'properties_id301', 
+				'properties_id226', 
+				'properties_id239', 
+				'properties_id240', 
+				'properties_id251', 
+				'properties_id260', 
+				'properties_id263', 
+				'properties_id264', 
+				'properties_id265', 
+				'properties_id281', 
+				'properties_id286', 
+				'properties_id294', 
+				'properties_id295', 
 				'properties_id302', 
-				'properties_id309', 
-				'properties_id313', 
+				'properties_id306', 
+				'properties_id310', 
+				'properties_id314', 
 				'properties_id317', 
-				'properties_id321', 
-				'properties_id324', 
-				'properties_id6', 
-				'properties_id9', 
-				'properties_id15', 
-				'properties_id17', 
-				'properties_id19', 
-				'properties_id21', 
-				'properties_id25', 
+				'properties_id7', 
+				'properties_id10', 
+				'properties_id16', 
+				'properties_id18', 
+				'properties_id20', 
+				'properties_id22', 
 				'properties_id26', 
-				'properties_id34', 
-				'properties_id44', 
+				'properties_id27', 
+				'properties_id35', 
 				'properties_id45', 
-				'properties_id47', 
-				'properties_id79', 
-				'properties_id81', 
+				'properties_id46', 
+				'properties_id48', 
 				'properties_id82', 
 				'properties_id84', 
-				'properties_id90', 
-				'properties_id92', 
-				'properties_id94', 
-				'properties_id99', 
+				'properties_id85', 
+				'properties_id87', 
+				'properties_id93', 
+				'properties_id95', 
+				'properties_id97', 
 				'properties_id102', 
-				'properties_id106', 
+				'properties_id105', 
 				'properties_id109', 
-				'properties_id110', 
-				'properties_id125', 
-				'properties_id127', 
-				'properties_id129', 
-				'properties_id133', 
-				'properties_id135', 
+				'properties_id112', 
+				'properties_id113', 
+				'properties_id120', 
+				'properties_id131', 
+				'properties_id137', 
 				'properties_id139', 
-				'properties_id141', 
-				'properties_id143', 
 				'properties_id144', 
 				'properties_id146', 
 				'properties_id148', 
-				'properties_id153', 
+				'properties_id149', 
+				'properties_id152', 
+				'properties_id155', 
+				'properties_id156', 
+				'properties_id157', 
 				'properties_id158', 
-				'properties_id161', 
+				'properties_id163', 
 				'properties_id164', 
 				'properties_id165', 
 				'properties_id166', 
 				'properties_id167', 
+				'properties_id170', 
+				'properties_id171', 
 				'properties_id172', 
-				'properties_id173', 
 				'properties_id174', 
 				'properties_id175', 
 				'properties_id176', 
-				'properties_id179', 
-				'properties_id180', 
-				'properties_id181', 
-				'properties_id183', 
-				'properties_id184', 
-				'properties_id209', 
+				'properties_id177', 
+				'properties_id202', 
+				'properties_id203', 
 				'properties_id210', 
-				'properties_id217', 
-				'properties_id219', 
-				'properties_id223', 
-				'properties_id237', 
-				'properties_id240', 
-				'properties_id242', 
-				'properties_id245', 
-				'properties_id251', 
+				'properties_id212', 
+				'properties_id216', 
+				'properties_id230', 
+				'properties_id233', 
+				'properties_id235', 
+				'properties_id238', 
+				'properties_id244', 
+				'properties_id250', 
+				'properties_id254', 
 				'properties_id257', 
-				'properties_id261', 
-				'properties_id264', 
-				'properties_id266', 
-				'properties_id269', 
+				'properties_id259', 
+				'properties_id262', 
+				'properties_id268', 
+				'properties_id272', 
+				'properties_id273', 
 				'properties_id275', 
 				'properties_id279', 
 				'properties_id280', 
-				'properties_id282', 
-				'properties_id286', 
-				'properties_id287', 
+				'properties_id284', 
+				'properties_id289', 
 				'properties_id291', 
-				'properties_id296', 
-				'properties_id298', 
+				'properties_id293', 
 				'properties_id300', 
-				'properties_id307', 
-				'properties_id308', 
+				'properties_id301', 
+				'properties_id320', 
+				'properties_id323', 
+				'properties_id325', 
 				'properties_id327', 
-				'properties_id330', 
-				'properties_id332', 
-				'properties_id334', 
-				'properties_id336', 
-				'properties_id338', 
-				'properties_id340', 
-				'properties_id342', 
-				'properties_id344', 
-				'properties_id346', 
-				'properties_id348', 
-				'properties_id354', 
-				'properties_id360', 
-				'properties_id362', 
-				'properties_id364', 
-				'properties_id366', 
-				'properties_id368', 
+				'properties_id329', 
+				'properties_id331', 
+				'properties_id333', 
+				'properties_id335', 
+				'properties_id337', 
+				'properties_id339', 
+				'properties_id341', 
+				'properties_id347', 
+				'properties_id353', 
+				'properties_id355', 
+				'properties_id357', 
+				'properties_id359', 
+				'properties_id361', 
+				'properties_id370', 
+				'properties_id373', 
+				'properties_id375', 
 				'properties_id377', 
 				'properties_id380', 
 				'properties_id382', 
 				'properties_id384', 
-				'properties_id387', 
-				'properties_id389', 
-				'properties_id391', 
-				'properties_id393', 
-				'properties_id395', 
-				'properties_id397', 
-				'properties_id399', 
-				'properties_id401', 
-				'properties_id403', 
-				'properties_id405', 
-				'properties_id407', 
-				'properties_id409', 
-				'properties_id411', 
-				'properties_id413', 
-				'properties_id415', 
-				'properties_id417', 
-				'properties_id419', 
-				'properties_id421', 
-				'properties_id423', 
-				'properties_id425', 
-				'properties_id427', 
-				'properties_id429', 
-				'properties_id431', 
-				'properties_id433', 
-				'properties_id435', 
-				'properties_id437', 
-				'properties_id439', 
-				'properties_id441', 
-				'properties_id443', 
-				'properties_id445', 
-				'properties_id447', 
-				'properties_id449', 
-				'properties_id451', 
-				'properties_id453', 
-				'properties_id455', 
-				'properties_id457', 
+				'properties_id386', 
+				'properties_id388', 
+				'properties_id390', 
+				'properties_id392', 
+				'properties_id394', 
+				'properties_id396', 
+				'properties_id398', 
+				'properties_id400', 
+				'properties_id402', 
+				'properties_id404', 
+				'properties_id406', 
+				'properties_id408', 
+				'properties_id410', 
+				'properties_id412', 
+				'properties_id414', 
+				'properties_id416', 
+				'properties_id418', 
+				'properties_id420', 
+				'properties_id422', 
+				'properties_id424', 
+				'properties_id426', 
+				'properties_id428', 
+				'properties_id430', 
+				'properties_id432', 
+				'properties_id434', 
+				'properties_id436', 
+				'properties_id438', 
+				'properties_id440', 
+				'properties_id442', 
+				'properties_id444', 
+				'properties_id446', 
+				'properties_id448', 
+				'properties_id450', 
+				'properties_id452', 
+				'properties_id454', 
+				'properties_id456', 
+				'properties_id458', 
 				'properties_id460', 
-				'properties_id462', 
-				'properties_id464', 
-				'properties_id466', 
-				'properties_id468', 
-				'properties_id470', 
-				'properties_id472', 
-				'properties_id474', 
-				'properties_id476', 
-				'properties_id479');
+				'properties_id463', 
+				'properties_id465', 
+				'properties_id467', 
+				'properties_id469', 
+				'properties_id471', 
+				'properties_id473', 
+				'properties_id475', 
+				'properties_id477', 
+				'properties_id480');
 
-        var facetsBoxes= new Array('facets_id187', 
+        var facetsBoxes= new Array('facets_id180', 
 				'facets_id2', 
 				'facets_id3', 
-				'facets_id188', 
-				'facets_id17', 
-				'facets_id21', 
-				'facets_id26', 
-				'facets_id34', 
-				'facets_id44', 
+				'facets_id4', 
+				'facets_id181', 
+				'facets_id7', 
+				'facets_id18', 
+				'facets_id22', 
+				'facets_id27', 
+				'facets_id35', 
 				'facets_id45', 
-				'facets_id82', 
-				'facets_id94', 
-				'facets_id109', 
-				'facets_id133', 
-				'facets_id139', 
-				'facets_id143', 
-				'facets_id161', 
-				'facets_id164', 
+				'facets_id46', 
+				'facets_id85', 
+				'facets_id97', 
+				'facets_id112', 
+				'facets_id137', 
+				'facets_id144', 
+				'facets_id148', 
+				'facets_id152', 
+				'facets_id155', 
+				'facets_id163', 
+				'facets_id166', 
+				'facets_id170', 
+				'facets_id171', 
 				'facets_id172', 
-				'facets_id175', 
-				'facets_id179', 
-				'facets_id180', 
-				'facets_id181', 
-				'facets_id183', 
-				'facets_id280', 
+				'facets_id174', 
+				'facets_id273', 
+				'facets_id284', 
+				'facets_id289', 
 				'facets_id291', 
-				'facets_id296', 
-				'facets_id298', 
-				'facets_id330', 
-				'facets_id332', 
-				'facets_id346', 
-				'facets_id387', 
-				'facets_id393', 
-				'facets_id413', 
-				'facets_id419', 
-				'facets_id427', 
-				'facets_id429', 
-				'facets_id431', 
-				'facets_id433', 
-				'facets_id439', 
-				'facets_id441', 
-				'facets_id449', 
-				'facets_id462', 
-				'facets_id472', 
-				'facets_id476');
+				'facets_id323', 
+				'facets_id325', 
+				'facets_id339', 
+				'facets_id380', 
+				'facets_id386', 
+				'facets_id406', 
+				'facets_id412', 
+				'facets_id420', 
+				'facets_id422', 
+				'facets_id424', 
+				'facets_id426', 
+				'facets_id436', 
+				'facets_id438', 
+				'facets_id446', 
+				'facets_id465', 
+				'facets_id473', 
+				'facets_id477');
 
-        var usedByBoxes= new Array('usedBy_id28', 
-				'usedBy_id29', 
+        var usedByBoxes= new Array('usedBy_id29', 
 				'usedBy_id30', 
 				'usedBy_id31', 
-				'usedBy_id35', 
+				'usedBy_id32', 
 				'usedBy_id36', 
 				'usedBy_id37', 
 				'usedBy_id38', 
@@ -299,144 +299,152 @@
 				'usedBy_id40', 
 				'usedBy_id41', 
 				'usedBy_id42', 
-				'usedBy_id50', 
+				'usedBy_id43', 
 				'usedBy_id51', 
 				'usedBy_id52', 
-				'usedBy_id54', 
-				'usedBy_id56', 
-				'usedBy_id58', 
+				'usedBy_id53', 
+				'usedBy_id55', 
+				'usedBy_id57', 
 				'usedBy_id59', 
-				'usedBy_id61', 
+				'usedBy_id60', 
 				'usedBy_id62', 
-				'usedBy_id64', 
+				'usedBy_id63', 
 				'usedBy_id65', 
-				'usedBy_id67', 
-				'usedBy_id69', 
-				'usedBy_id71', 
+				'usedBy_id66', 
+				'usedBy_id68', 
+				'usedBy_id70', 
 				'usedBy_id72', 
-				'usedBy_id73', 
 				'usedBy_id74', 
 				'usedBy_id75', 
 				'usedBy_id76', 
-				'usedBy_id87', 
-				'usedBy_id95', 
-				'usedBy_id107', 
-				'usedBy_id111', 
-				'usedBy_id112', 
-				'usedBy_id113', 
+				'usedBy_id77', 
+				'usedBy_id78', 
+				'usedBy_id79', 
+				'usedBy_id90', 
+				'usedBy_id98', 
+				'usedBy_id110', 
+				'usedBy_id114', 
+				'usedBy_id115', 
 				'usedBy_id116', 
-				'usedBy_id120', 
 				'usedBy_id121', 
-				'usedBy_id122', 
-				'usedBy_id130', 
-				'usedBy_id136', 
-				'usedBy_id149', 
-				'usedBy_id150', 
-				'usedBy_id154', 
+				'usedBy_id125', 
+				'usedBy_id126', 
+				'usedBy_id127', 
+				'usedBy_id134', 
+				'usedBy_id141', 
+				'usedBy_id179', 
+				'usedBy_id180', 
+				'usedBy_id182', 
+				'usedBy_id184', 
 				'usedBy_id186', 
-				'usedBy_id187', 
+				'usedBy_id188', 
 				'usedBy_id189', 
+				'usedBy_id190', 
 				'usedBy_id191', 
+				'usedBy_id192', 
 				'usedBy_id193', 
-				'usedBy_id195', 
-				'usedBy_id196', 
+				'usedBy_id194', 
 				'usedBy_id197', 
 				'usedBy_id198', 
-				'usedBy_id199', 
-				'usedBy_id200', 
-				'usedBy_id201', 
 				'usedBy_id204', 
 				'usedBy_id205', 
-				'usedBy_id211', 
-				'usedBy_id212', 
+				'usedBy_id206', 
 				'usedBy_id213', 
+				'usedBy_id217', 
+				'usedBy_id218', 
 				'usedBy_id220', 
+				'usedBy_id222', 
 				'usedBy_id224', 
-				'usedBy_id225', 
-				'usedBy_id227', 
-				'usedBy_id229', 
-				'usedBy_id231', 
-				'usedBy_id233', 
-				'usedBy_id246', 
-				'usedBy_id247', 
-				'usedBy_id258', 
-				'usedBy_id267', 
-				'usedBy_id270', 
-				'usedBy_id271', 
-				'usedBy_id272', 
-				'usedBy_id288', 
-				'usedBy_id293', 
-				'usedBy_id301', 
+				'usedBy_id226', 
+				'usedBy_id239', 
+				'usedBy_id240', 
+				'usedBy_id251', 
+				'usedBy_id260', 
+				'usedBy_id263', 
+				'usedBy_id264', 
+				'usedBy_id265', 
+				'usedBy_id281', 
+				'usedBy_id286', 
+				'usedBy_id294', 
+				'usedBy_id295', 
 				'usedBy_id302', 
-				'usedBy_id309', 
-				'usedBy_id313', 
+				'usedBy_id306', 
+				'usedBy_id310', 
+				'usedBy_id314', 
 				'usedBy_id317', 
-				'usedBy_id321', 
-				'usedBy_id324', 
 				'usedBy_id2', 
 				'usedBy_id3', 
-				'usedBy_id53', 
-				'usedBy_id55', 
-				'usedBy_id57', 
-				'usedBy_id60', 
-				'usedBy_id63', 
-				'usedBy_id66', 
-				'usedBy_id68', 
-				'usedBy_id70', 
-				'usedBy_id188', 
-				'usedBy_id190', 
-				'usedBy_id192', 
-				'usedBy_id194', 
-				'usedBy_id232', 
-				'usedBy_id6', 
-				'usedBy_id9', 
-				'usedBy_id15', 
-				'usedBy_id17', 
-				'usedBy_id19', 
-				'usedBy_id21', 
-				'usedBy_id23', 
+				'usedBy_id4', 
+				'usedBy_id54', 
+				'usedBy_id56', 
+				'usedBy_id58', 
+				'usedBy_id61', 
+				'usedBy_id64', 
+				'usedBy_id67', 
+				'usedBy_id69', 
+				'usedBy_id71', 
+				'usedBy_id73', 
+				'usedBy_id181', 
+				'usedBy_id183', 
+				'usedBy_id185', 
+				'usedBy_id187', 
+				'usedBy_id225', 
+				'usedBy_id7', 
+				'usedBy_id10', 
+				'usedBy_id16', 
+				'usedBy_id18', 
+				'usedBy_id20', 
+				'usedBy_id22', 
 				'usedBy_id24', 
 				'usedBy_id25', 
 				'usedBy_id26', 
-				'usedBy_id34', 
-				'usedBy_id44', 
+				'usedBy_id27', 
+				'usedBy_id35', 
 				'usedBy_id45', 
-				'usedBy_id47', 
-				'usedBy_id49', 
-				'usedBy_id79', 
-				'usedBy_id81', 
+				'usedBy_id46', 
+				'usedBy_id48', 
+				'usedBy_id50', 
 				'usedBy_id82', 
-				'usedBy_id83', 
 				'usedBy_id84', 
+				'usedBy_id85', 
 				'usedBy_id86', 
-				'usedBy_id90', 
-				'usedBy_id92', 
-				'usedBy_id94', 
-				'usedBy_id99', 
+				'usedBy_id87', 
+				'usedBy_id89', 
+				'usedBy_id93', 
+				'usedBy_id95', 
+				'usedBy_id97', 
 				'usedBy_id102', 
-				'usedBy_id103', 
 				'usedBy_id105', 
 				'usedBy_id106', 
+				'usedBy_id108', 
 				'usedBy_id109', 
-				'usedBy_id110', 
-				'usedBy_id119', 
-				'usedBy_id125', 
-				'usedBy_id127', 
+				'usedBy_id112', 
+				'usedBy_id113', 
+				'usedBy_id120', 
+				'usedBy_id124', 
 				'usedBy_id129', 
+				'usedBy_id131', 
+				'usedBy_id132', 
 				'usedBy_id133', 
-				'usedBy_id135', 
+				'usedBy_id137', 
 				'usedBy_id139', 
-				'usedBy_id141', 
-				'usedBy_id143', 
+				'usedBy_id140', 
 				'usedBy_id144', 
-				'usedBy_id145', 
 				'usedBy_id146', 
 				'usedBy_id148', 
-				'usedBy_id153', 
+				'usedBy_id149', 
+				'usedBy_id150', 
+				'usedBy_id151', 
+				'usedBy_id152', 
+				'usedBy_id155', 
 				'usedBy_id156', 
+				'usedBy_id157', 
 				'usedBy_id158', 
+				'usedBy_id159', 
 				'usedBy_id160', 
 				'usedBy_id161', 
+				'usedBy_id162', 
+				'usedBy_id163', 
 				'usedBy_id164', 
 				'usedBy_id165', 
 				'usedBy_id166', 
@@ -452,241 +460,230 @@
 				'usedBy_id176', 
 				'usedBy_id177', 
 				'usedBy_id178', 
-				'usedBy_id179', 
-				'usedBy_id180', 
-				'usedBy_id181', 
-				'usedBy_id182', 
-				'usedBy_id183', 
-				'usedBy_id184', 
-				'usedBy_id185', 
+				'usedBy_id196', 
+				'usedBy_id202', 
 				'usedBy_id203', 
-				'usedBy_id209', 
 				'usedBy_id210', 
-				'usedBy_id217', 
-				'usedBy_id219', 
-				'usedBy_id223', 
+				'usedBy_id212', 
+				'usedBy_id216', 
+				'usedBy_id230', 
+				'usedBy_id233', 
+				'usedBy_id235', 
+				'usedBy_id236', 
 				'usedBy_id237', 
-				'usedBy_id240', 
-				'usedBy_id242', 
+				'usedBy_id238', 
 				'usedBy_id243', 
 				'usedBy_id244', 
 				'usedBy_id245', 
+				'usedBy_id246', 
+				'usedBy_id247', 
+				'usedBy_id248', 
+				'usedBy_id249', 
 				'usedBy_id250', 
-				'usedBy_id251', 
-				'usedBy_id252', 
-				'usedBy_id253', 
 				'usedBy_id254', 
-				'usedBy_id255', 
-				'usedBy_id256', 
 				'usedBy_id257', 
-				'usedBy_id261', 
-				'usedBy_id264', 
-				'usedBy_id266', 
+				'usedBy_id259', 
+				'usedBy_id262', 
+				'usedBy_id268', 
 				'usedBy_id269', 
+				'usedBy_id272', 
+				'usedBy_id273', 
 				'usedBy_id275', 
 				'usedBy_id276', 
 				'usedBy_id279', 
 				'usedBy_id280', 
-				'usedBy_id282', 
-				'usedBy_id283', 
-				'usedBy_id286', 
-				'usedBy_id287', 
+				'usedBy_id284', 
+				'usedBy_id285', 
+				'usedBy_id289', 
+				'usedBy_id290', 
 				'usedBy_id291', 
 				'usedBy_id292', 
-				'usedBy_id296', 
-				'usedBy_id297', 
+				'usedBy_id293', 
 				'usedBy_id298', 
 				'usedBy_id299', 
 				'usedBy_id300', 
+				'usedBy_id301', 
 				'usedBy_id305', 
-				'usedBy_id306', 
-				'usedBy_id307', 
-				'usedBy_id308', 
-				'usedBy_id312', 
-				'usedBy_id316', 
+				'usedBy_id309', 
+				'usedBy_id313', 
 				'usedBy_id320', 
+				'usedBy_id323', 
+				'usedBy_id324', 
+				'usedBy_id325', 
 				'usedBy_id327', 
-				'usedBy_id330', 
+				'usedBy_id329', 
 				'usedBy_id331', 
-				'usedBy_id332', 
-				'usedBy_id334', 
-				'usedBy_id336', 
-				'usedBy_id338', 
-				'usedBy_id340', 
-				'usedBy_id342', 
-				'usedBy_id344', 
-				'usedBy_id346', 
-				'usedBy_id348', 
-				'usedBy_id354', 
-				'usedBy_id360', 
-				'usedBy_id362', 
-				'usedBy_id364', 
-				'usedBy_id366', 
-				'usedBy_id368', 
+				'usedBy_id333', 
+				'usedBy_id335', 
+				'usedBy_id337', 
+				'usedBy_id339', 
+				'usedBy_id341', 
+				'usedBy_id347', 
+				'usedBy_id353', 
+				'usedBy_id355', 
+				'usedBy_id357', 
+				'usedBy_id359', 
+				'usedBy_id361', 
+				'usedBy_id370', 
+				'usedBy_id373', 
+				'usedBy_id375', 
 				'usedBy_id377', 
 				'usedBy_id380', 
 				'usedBy_id382', 
 				'usedBy_id384', 
-				'usedBy_id387', 
-				'usedBy_id389', 
-				'usedBy_id391', 
-				'usedBy_id393', 
-				'usedBy_id395', 
-				'usedBy_id397', 
-				'usedBy_id399', 
-				'usedBy_id401', 
-				'usedBy_id403', 
-				'usedBy_id405', 
-				'usedBy_id407', 
-				'usedBy_id409', 
-				'usedBy_id411', 
-				'usedBy_id413', 
-				'usedBy_id415', 
-				'usedBy_id417', 
-				'usedBy_id419', 
-				'usedBy_id421', 
-				'usedBy_id423', 
-				'usedBy_id425', 
-				'usedBy_id427', 
-				'usedBy_id429', 
-				'usedBy_id431', 
-				'usedBy_id433', 
-				'usedBy_id435', 
-				'usedBy_id437', 
-				'usedBy_id439', 
-				'usedBy_id441', 
-				'usedBy_id443', 
-				'usedBy_id445', 
-				'usedBy_id447', 
-				'usedBy_id449', 
-				'usedBy_id451', 
-				'usedBy_id453', 
-				'usedBy_id455', 
-				'usedBy_id457', 
+				'usedBy_id386', 
+				'usedBy_id388', 
+				'usedBy_id390', 
+				'usedBy_id392', 
+				'usedBy_id394', 
+				'usedBy_id396', 
+				'usedBy_id398', 
+				'usedBy_id400', 
+				'usedBy_id402', 
+				'usedBy_id404', 
+				'usedBy_id406', 
+				'usedBy_id408', 
+				'usedBy_id410', 
+				'usedBy_id412', 
+				'usedBy_id414', 
+				'usedBy_id416', 
+				'usedBy_id418', 
+				'usedBy_id420', 
+				'usedBy_id422', 
+				'usedBy_id424', 
+				'usedBy_id426', 
+				'usedBy_id428', 
+				'usedBy_id430', 
+				'usedBy_id432', 
+				'usedBy_id434', 
+				'usedBy_id436', 
+				'usedBy_id438', 
+				'usedBy_id440', 
+				'usedBy_id442', 
+				'usedBy_id444', 
+				'usedBy_id446', 
+				'usedBy_id448', 
+				'usedBy_id450', 
+				'usedBy_id452', 
+				'usedBy_id454', 
+				'usedBy_id456', 
+				'usedBy_id458', 
 				'usedBy_id460', 
-				'usedBy_id462', 
-				'usedBy_id464', 
-				'usedBy_id466', 
-				'usedBy_id468', 
-				'usedBy_id470', 
-				'usedBy_id472', 
-				'usedBy_id474', 
-				'usedBy_id476', 
-				'usedBy_id479', 
-				'usedBy_id4', 
+				'usedBy_id463', 
+				'usedBy_id465', 
+				'usedBy_id467', 
+				'usedBy_id469', 
+				'usedBy_id471', 
+				'usedBy_id473', 
+				'usedBy_id475', 
+				'usedBy_id477', 
+				'usedBy_id480', 
 				'usedBy_id5', 
-				'usedBy_id8', 
-				'usedBy_id16', 
-				'usedBy_id22', 
-				'usedBy_id32', 
+				'usedBy_id6', 
+				'usedBy_id9', 
+				'usedBy_id17', 
+				'usedBy_id23', 
 				'usedBy_id33', 
-				'usedBy_id43', 
-				'usedBy_id46', 
-				'usedBy_id48', 
-				'usedBy_id77', 
-				'usedBy_id78', 
+				'usedBy_id34', 
+				'usedBy_id44', 
+				'usedBy_id47', 
+				'usedBy_id49', 
 				'usedBy_id80', 
-				'usedBy_id85', 
+				'usedBy_id81', 
+				'usedBy_id83', 
 				'usedBy_id88', 
-				'usedBy_id89', 
 				'usedBy_id91', 
-				'usedBy_id93', 
+				'usedBy_id92', 
+				'usedBy_id94', 
 				'usedBy_id96', 
-				'usedBy_id97', 
-				'usedBy_id98', 
+				'usedBy_id99', 
 				'usedBy_id100', 
 				'usedBy_id101', 
+				'usedBy_id103', 
 				'usedBy_id104', 
-				'usedBy_id108', 
-				'usedBy_id114', 
-				'usedBy_id115', 
+				'usedBy_id107', 
+				'usedBy_id111', 
 				'usedBy_id117', 
 				'usedBy_id118', 
+				'usedBy_id119', 
+				'usedBy_id122', 
 				'usedBy_id123', 
-				'usedBy_id124', 
-				'usedBy_id126', 
 				'usedBy_id128', 
-				'usedBy_id131', 
-				'usedBy_id132', 
-				'usedBy_id134', 
-				'usedBy_id137', 
+				'usedBy_id130', 
+				'usedBy_id135', 
+				'usedBy_id136', 
 				'usedBy_id138', 
-				'usedBy_id140', 
 				'usedBy_id142', 
+				'usedBy_id143', 
+				'usedBy_id145', 
 				'usedBy_id147', 
-				'usedBy_id151', 
-				'usedBy_id152', 
-				'usedBy_id155', 
-				'usedBy_id157', 
-				'usedBy_id159', 
-				'usedBy_id162', 
-				'usedBy_id163', 
-				'usedBy_id202', 
-				'usedBy_id206', 
+				'usedBy_id153', 
+				'usedBy_id154', 
+				'usedBy_id195', 
+				'usedBy_id199', 
+				'usedBy_id200', 
+				'usedBy_id201', 
 				'usedBy_id207', 
 				'usedBy_id208', 
+				'usedBy_id209', 
+				'usedBy_id211', 
 				'usedBy_id214', 
 				'usedBy_id215', 
-				'usedBy_id216', 
-				'usedBy_id218', 
+				'usedBy_id219', 
 				'usedBy_id221', 
-				'usedBy_id222', 
-				'usedBy_id226', 
+				'usedBy_id223', 
+				'usedBy_id227', 
 				'usedBy_id228', 
-				'usedBy_id230', 
+				'usedBy_id229', 
+				'usedBy_id231', 
+				'usedBy_id232', 
 				'usedBy_id234', 
-				'usedBy_id235', 
-				'usedBy_id236', 
-				'usedBy_id238', 
-				'usedBy_id239', 
 				'usedBy_id241', 
-				'usedBy_id248', 
-				'usedBy_id249', 
-				'usedBy_id259', 
-				'usedBy_id260', 
-				'usedBy_id262', 
-				'usedBy_id263', 
-				'usedBy_id265', 
-				'usedBy_id268', 
-				'usedBy_id273', 
+				'usedBy_id242', 
+				'usedBy_id252', 
+				'usedBy_id253', 
+				'usedBy_id255', 
+				'usedBy_id256', 
+				'usedBy_id258', 
+				'usedBy_id261', 
+				'usedBy_id266', 
+				'usedBy_id267', 
+				'usedBy_id270', 
+				'usedBy_id271', 
 				'usedBy_id274', 
 				'usedBy_id277', 
 				'usedBy_id278', 
-				'usedBy_id281', 
-				'usedBy_id284', 
-				'usedBy_id285', 
-				'usedBy_id289', 
-				'usedBy_id290', 
-				'usedBy_id294', 
-				'usedBy_id295', 
+				'usedBy_id282', 
+				'usedBy_id283', 
+				'usedBy_id287', 
+				'usedBy_id288', 
+				'usedBy_id296', 
+				'usedBy_id297', 
 				'usedBy_id303', 
 				'usedBy_id304', 
-				'usedBy_id310', 
+				'usedBy_id307', 
+				'usedBy_id308', 
 				'usedBy_id311', 
-				'usedBy_id314', 
+				'usedBy_id312', 
 				'usedBy_id315', 
+				'usedBy_id316', 
 				'usedBy_id318', 
 				'usedBy_id319', 
+				'usedBy_id321', 
 				'usedBy_id322', 
-				'usedBy_id323', 
-				'usedBy_id325', 
 				'usedBy_id326', 
 				'usedBy_id328', 
-				'usedBy_id329', 
-				'usedBy_id333', 
-				'usedBy_id335', 
-				'usedBy_id337', 
-				'usedBy_id339', 
-				'usedBy_id343', 
-				'usedBy_id345', 
-				'usedBy_id347');
+				'usedBy_id330', 
+				'usedBy_id332', 
+				'usedBy_id336', 
+				'usedBy_id338', 
+				'usedBy_id340');
 
-        var sourceBoxes= new Array('source_id27', 
-				'source_id28', 
+        var sourceBoxes= new Array('source_id28', 
 				'source_id29', 
 				'source_id30', 
 				'source_id31', 
-				'source_id35', 
+				'source_id32', 
 				'source_id36', 
 				'source_id37', 
 				'source_id38', 
@@ -694,144 +691,152 @@
 				'source_id40', 
 				'source_id41', 
 				'source_id42', 
-				'source_id50', 
+				'source_id43', 
 				'source_id51', 
 				'source_id52', 
-				'source_id54', 
-				'source_id56', 
-				'source_id58', 
+				'source_id53', 
+				'source_id55', 
+				'source_id57', 
 				'source_id59', 
-				'source_id61', 
+				'source_id60', 
 				'source_id62', 
-				'source_id64', 
+				'source_id63', 
 				'source_id65', 
-				'source_id67', 
-				'source_id69', 
-				'source_id71', 
+				'source_id66', 
+				'source_id68', 
+				'source_id70', 
 				'source_id72', 
-				'source_id73', 
 				'source_id74', 
 				'source_id75', 
 				'source_id76', 
-				'source_id87', 
-				'source_id95', 
-				'source_id107', 
-				'source_id111', 
-				'source_id112', 
-				'source_id113', 
+				'source_id77', 
+				'source_id78', 
+				'source_id79', 
+				'source_id90', 
+				'source_id98', 
+				'source_id110', 
+				'source_id114', 
+				'source_id115', 
 				'source_id116', 
-				'source_id120', 
 				'source_id121', 
-				'source_id122', 
-				'source_id130', 
-				'source_id136', 
-				'source_id149', 
-				'source_id150', 
-				'source_id154', 
+				'source_id125', 
+				'source_id126', 
+				'source_id127', 
+				'source_id134', 
+				'source_id141', 
+				'source_id179', 
+				'source_id180', 
+				'source_id182', 
+				'source_id184', 
 				'source_id186', 
-				'source_id187', 
+				'source_id188', 
 				'source_id189', 
+				'source_id190', 
 				'source_id191', 
+				'source_id192', 
 				'source_id193', 
-				'source_id195', 
-				'source_id196', 
+				'source_id194', 
 				'source_id197', 
 				'source_id198', 
-				'source_id199', 
-				'source_id200', 
-				'source_id201', 
 				'source_id204', 
 				'source_id205', 
-				'source_id211', 
-				'source_id212', 
+				'source_id206', 
 				'source_id213', 
+				'source_id217', 
+				'source_id218', 
 				'source_id220', 
+				'source_id222', 
 				'source_id224', 
-				'source_id225', 
-				'source_id227', 
-				'source_id229', 
-				'source_id231', 
-				'source_id233', 
-				'source_id246', 
-				'source_id247', 
-				'source_id258', 
-				'source_id267', 
-				'source_id270', 
-				'source_id271', 
-				'source_id272', 
-				'source_id288', 
-				'source_id293', 
-				'source_id301', 
+				'source_id226', 
+				'source_id239', 
+				'source_id240', 
+				'source_id251', 
+				'source_id260', 
+				'source_id263', 
+				'source_id264', 
+				'source_id265', 
+				'source_id281', 
+				'source_id286', 
+				'source_id294', 
+				'source_id295', 
 				'source_id302', 
-				'source_id309', 
-				'source_id313', 
+				'source_id306', 
+				'source_id310', 
+				'source_id314', 
 				'source_id317', 
-				'source_id321', 
-				'source_id324', 
 				'source_id2', 
 				'source_id3', 
-				'source_id53', 
-				'source_id55', 
-				'source_id57', 
-				'source_id60', 
-				'source_id63', 
-				'source_id66', 
-				'source_id68', 
-				'source_id70', 
-				'source_id188', 
-				'source_id190', 
-				'source_id192', 
-				'source_id194', 
-				'source_id232', 
-				'source_id6', 
-				'source_id9', 
-				'source_id15', 
-				'source_id17', 
-				'source_id19', 
-				'source_id21', 
-				'source_id23', 
+				'source_id4', 
+				'source_id54', 
+				'source_id56', 
+				'source_id58', 
+				'source_id61', 
+				'source_id64', 
+				'source_id67', 
+				'source_id69', 
+				'source_id71', 
+				'source_id73', 
+				'source_id181', 
+				'source_id183', 
+				'source_id185', 
+				'source_id187', 
+				'source_id225', 
+				'source_id7', 
+				'source_id10', 
+				'source_id16', 
+				'source_id18', 
+				'source_id20', 
+				'source_id22', 
 				'source_id24', 
 				'source_id25', 
 				'source_id26', 
-				'source_id34', 
-				'source_id44', 
+				'source_id27', 
+				'source_id35', 
 				'source_id45', 
-				'source_id47', 
-				'source_id49', 
-				'source_id79', 
-				'source_id81', 
+				'source_id46', 
+				'source_id48', 
+				'source_id50', 
 				'source_id82', 
-				'source_id83', 
 				'source_id84', 
+				'source_id85', 
 				'source_id86', 
-				'source_id90', 
-				'source_id92', 
-				'source_id94', 
-				'source_id99', 
+				'source_id87', 
+				'source_id89', 
+				'source_id93', 
+				'source_id95', 
+				'source_id97', 
 				'source_id102', 
-				'source_id103', 
 				'source_id105', 
 				'source_id106', 
+				'source_id108', 
 				'source_id109', 
-				'source_id110', 
-				'source_id119', 
-				'source_id125', 
-				'source_id127', 
+				'source_id112', 
+				'source_id113', 
+				'source_id120', 
+				'source_id124', 
 				'source_id129', 
+				'source_id131', 
+				'source_id132', 
 				'source_id133', 
-				'source_id135', 
+				'source_id137', 
 				'source_id139', 
-				'source_id141', 
-				'source_id143', 
+				'source_id140', 
 				'source_id144', 
-				'source_id145', 
 				'source_id146', 
 				'source_id148', 
-				'source_id153', 
+				'source_id149', 
+				'source_id150', 
+				'source_id151', 
+				'source_id152', 
+				'source_id155', 
 				'source_id156', 
+				'source_id157', 
 				'source_id158', 
+				'source_id159', 
 				'source_id160', 
 				'source_id161', 
+				'source_id162', 
+				'source_id163', 
 				'source_id164', 
 				'source_id165', 
 				'source_id166', 
@@ -847,349 +852,341 @@
 				'source_id176', 
 				'source_id177', 
 				'source_id178', 
-				'source_id179', 
-				'source_id180', 
-				'source_id181', 
-				'source_id182', 
-				'source_id183', 
-				'source_id184', 
-				'source_id185', 
+				'source_id196', 
+				'source_id202', 
 				'source_id203', 
-				'source_id209', 
 				'source_id210', 
-				'source_id217', 
-				'source_id219', 
-				'source_id223', 
+				'source_id212', 
+				'source_id216', 
+				'source_id230', 
+				'source_id233', 
+				'source_id235', 
+				'source_id236', 
 				'source_id237', 
-				'source_id240', 
-				'source_id242', 
+				'source_id238', 
 				'source_id243', 
 				'source_id244', 
 				'source_id245', 
+				'source_id246', 
+				'source_id247', 
+				'source_id248', 
+				'source_id249', 
 				'source_id250', 
-				'source_id251', 
-				'source_id252', 
-				'source_id253', 
 				'source_id254', 
-				'source_id255', 
-				'source_id256', 
 				'source_id257', 
-				'source_id261', 
-				'source_id264', 
-				'source_id266', 
+				'source_id259', 
+				'source_id262', 
+				'source_id268', 
 				'source_id269', 
+				'source_id272', 
+				'source_id273', 
 				'source_id275', 
 				'source_id276', 
 				'source_id279', 
 				'source_id280', 
-				'source_id282', 
-				'source_id283', 
-				'source_id286', 
-				'source_id287', 
+				'source_id284', 
+				'source_id285', 
+				'source_id289', 
+				'source_id290', 
 				'source_id291', 
 				'source_id292', 
-				'source_id296', 
-				'source_id297', 
+				'source_id293', 
 				'source_id298', 
 				'source_id299', 
 				'source_id300', 
+				'source_id301', 
 				'source_id305', 
-				'source_id306', 
-				'source_id307', 
-				'source_id308', 
-				'source_id312', 
-				'source_id316', 
+				'source_id309', 
+				'source_id313', 
 				'source_id320', 
+				'source_id323', 
+				'source_id324', 
+				'source_id325', 
 				'source_id327', 
-				'source_id330', 
+				'source_id329', 
 				'source_id331', 
-				'source_id332', 
-				'source_id334', 
-				'source_id336', 
-				'source_id338', 
-				'source_id340', 
-				'source_id342', 
-				'source_id344', 
-				'source_id346', 
-				'source_id348', 
-				'source_id354', 
-				'source_id360', 
-				'source_id362', 
-				'source_id364', 
-				'source_id366', 
-				'source_id368', 
+				'source_id333', 
+				'source_id335', 
+				'source_id337', 
+				'source_id339', 
+				'source_id341', 
+				'source_id347', 
+				'source_id353', 
+				'source_id355', 
+				'source_id357', 
+				'source_id359', 
+				'source_id361', 
+				'source_id370', 
+				'source_id373', 
+				'source_id375', 
 				'source_id377', 
 				'source_id380', 
 				'source_id382', 
 				'source_id384', 
-				'source_id387', 
-				'source_id389', 
-				'source_id391', 
-				'source_id393', 
-				'source_id395', 
-				'source_id397', 
-				'source_id399', 
-				'source_id401', 
-				'source_id403', 
-				'source_id405', 
-				'source_id407', 
-				'source_id409', 
-				'source_id411', 
-				'source_id413', 
-				'source_id415', 
-				'source_id417', 
-				'source_id419', 
-				'source_id421', 
-				'source_id423', 
-				'source_id425', 
-				'source_id427', 
-				'source_id429', 
-				'source_id431', 
-				'source_id433', 
-				'source_id435', 
-				'source_id437', 
-				'source_id439', 
-				'source_id441', 
-				'source_id443', 
-				'source_id445', 
-				'source_id447', 
-				'source_id449', 
-				'source_id451', 
-				'source_id453', 
-				'source_id455', 
-				'source_id457', 
+				'source_id386', 
+				'source_id388', 
+				'source_id390', 
+				'source_id392', 
+				'source_id394', 
+				'source_id396', 
+				'source_id398', 
+				'source_id400', 
+				'source_id402', 
+				'source_id404', 
+				'source_id406', 
+				'source_id408', 
+				'source_id410', 
+				'source_id412', 
+				'source_id414', 
+				'source_id416', 
+				'source_id418', 
+				'source_id420', 
+				'source_id422', 
+				'source_id424', 
+				'source_id426', 
+				'source_id428', 
+				'source_id430', 
+				'source_id432', 
+				'source_id434', 
+				'source_id436', 
+				'source_id438', 
+				'source_id440', 
+				'source_id442', 
+				'source_id444', 
+				'source_id446', 
+				'source_id448', 
+				'source_id450', 
+				'source_id452', 
+				'source_id454', 
+				'source_id456', 
+				'source_id458', 
 				'source_id460', 
-				'source_id462', 
-				'source_id464', 
-				'source_id466', 
-				'source_id468', 
-				'source_id470', 
-				'source_id472', 
-				'source_id474', 
-				'source_id476', 
-				'source_id479', 
-				'source_id4', 
+				'source_id463', 
+				'source_id465', 
+				'source_id467', 
+				'source_id469', 
+				'source_id471', 
+				'source_id473', 
+				'source_id475', 
+				'source_id477', 
+				'source_id480', 
 				'source_id5', 
-				'source_id7', 
+				'source_id6', 
 				'source_id8', 
-				'source_id10', 
-				'source_id12', 
-				'source_id14', 
-				'source_id16', 
-				'source_id18', 
-				'source_id20', 
-				'source_id22', 
-				'source_id32', 
+				'source_id9', 
+				'source_id11', 
+				'source_id13', 
+				'source_id15', 
+				'source_id17', 
+				'source_id19', 
+				'source_id21', 
+				'source_id23', 
 				'source_id33', 
-				'source_id43', 
-				'source_id46', 
-				'source_id48', 
-				'source_id77', 
-				'source_id78', 
+				'source_id34', 
+				'source_id44', 
+				'source_id47', 
+				'source_id49', 
 				'source_id80', 
-				'source_id85', 
+				'source_id81', 
+				'source_id83', 
 				'source_id88', 
-				'source_id89', 
 				'source_id91', 
-				'source_id93', 
+				'source_id92', 
+				'source_id94', 
 				'source_id96', 
-				'source_id97', 
-				'source_id98', 
+				'source_id99', 
 				'source_id100', 
 				'source_id101', 
+				'source_id103', 
 				'source_id104', 
-				'source_id108', 
-				'source_id114', 
-				'source_id115', 
+				'source_id107', 
+				'source_id111', 
 				'source_id117', 
 				'source_id118', 
+				'source_id119', 
+				'source_id122', 
 				'source_id123', 
-				'source_id124', 
-				'source_id126', 
 				'source_id128', 
-				'source_id131', 
-				'source_id132', 
-				'source_id134', 
-				'source_id137', 
+				'source_id130', 
+				'source_id135', 
+				'source_id136', 
 				'source_id138', 
-				'source_id140', 
 				'source_id142', 
+				'source_id143', 
+				'source_id145', 
 				'source_id147', 
-				'source_id151', 
-				'source_id152', 
-				'source_id155', 
-				'source_id157', 
-				'source_id159', 
-				'source_id162', 
-				'source_id163', 
-				'source_id202', 
-				'source_id206', 
+				'source_id153', 
+				'source_id154', 
+				'source_id195', 
+				'source_id199', 
+				'source_id200', 
+				'source_id201', 
 				'source_id207', 
 				'source_id208', 
+				'source_id209', 
+				'source_id211', 
 				'source_id214', 
 				'source_id215', 
-				'source_id216', 
-				'source_id218', 
+				'source_id219', 
 				'source_id221', 
-				'source_id222', 
-				'source_id226', 
+				'source_id223', 
+				'source_id227', 
 				'source_id228', 
-				'source_id230', 
+				'source_id229', 
+				'source_id231', 
+				'source_id232', 
 				'source_id234', 
-				'source_id235', 
-				'source_id236', 
-				'source_id238', 
-				'source_id239', 
 				'source_id241', 
-				'source_id248', 
-				'source_id249', 
-				'source_id259', 
-				'source_id260', 
-				'source_id262', 
-				'source_id263', 
-				'source_id265', 
-				'source_id268', 
-				'source_id273', 
+				'source_id242', 
+				'source_id252', 
+				'source_id253', 
+				'source_id255', 
+				'source_id256', 
+				'source_id258', 
+				'source_id261', 
+				'source_id266', 
+				'source_id267', 
+				'source_id270', 
+				'source_id271', 
 				'source_id274', 
 				'source_id277', 
 				'source_id278', 
-				'source_id281', 
-				'source_id284', 
-				'source_id285', 
-				'source_id289', 
-				'source_id290', 
-				'source_id294', 
-				'source_id295', 
+				'source_id282', 
+				'source_id283', 
+				'source_id287', 
+				'source_id288', 
+				'source_id296', 
+				'source_id297', 
 				'source_id303', 
 				'source_id304', 
-				'source_id310', 
+				'source_id307', 
+				'source_id308', 
 				'source_id311', 
-				'source_id314', 
+				'source_id312', 
 				'source_id315', 
+				'source_id316', 
 				'source_id318', 
 				'source_id319', 
+				'source_id321', 
 				'source_id322', 
-				'source_id323', 
-				'source_id325', 
 				'source_id326', 
 				'source_id328', 
-				'source_id329', 
-				'source_id333', 
-				'source_id335', 
-				'source_id337', 
-				'source_id339', 
-				'source_id341', 
+				'source_id330', 
+				'source_id332', 
+				'source_id334', 
+				'source_id336', 
+				'source_id338', 
+				'source_id340', 
+				'source_id342', 
 				'source_id343', 
+				'source_id344', 
 				'source_id345', 
-				'source_id347', 
+				'source_id346', 
+				'source_id348', 
 				'source_id349', 
 				'source_id350', 
 				'source_id351', 
 				'source_id352', 
-				'source_id353', 
-				'source_id355', 
+				'source_id354', 
 				'source_id356', 
-				'source_id357', 
 				'source_id358', 
-				'source_id359', 
-				'source_id361', 
+				'source_id360', 
+				'source_id362', 
 				'source_id363', 
+				'source_id364', 
 				'source_id365', 
+				'source_id366', 
 				'source_id367', 
+				'source_id368', 
 				'source_id369', 
-				'source_id370', 
 				'source_id371', 
 				'source_id372', 
-				'source_id373', 
 				'source_id374', 
-				'source_id375', 
 				'source_id376', 
 				'source_id378', 
 				'source_id379', 
 				'source_id381', 
 				'source_id383', 
 				'source_id385', 
-				'source_id386', 
-				'source_id388', 
-				'source_id390', 
-				'source_id392', 
-				'source_id394', 
-				'source_id396', 
-				'source_id398', 
-				'source_id400', 
-				'source_id402', 
-				'source_id404', 
-				'source_id406', 
-				'source_id408', 
-				'source_id410', 
-				'source_id412', 
-				'source_id414', 
-				'source_id416', 
-				'source_id418', 
-				'source_id420', 
-				'source_id422', 
-				'source_id424', 
-				'source_id426', 
-				'source_id428', 
-				'source_id430', 
-				'source_id432', 
-				'source_id434', 
-				'source_id436', 
-				'source_id438', 
-				'source_id440', 
-				'source_id442', 
-				'source_id444', 
-				'source_id446', 
-				'source_id448', 
-				'source_id450', 
-				'source_id452', 
-				'source_id454', 
-				'source_id456', 
-				'source_id458', 
+				'source_id387', 
+				'source_id389', 
+				'source_id391', 
+				'source_id393', 
+				'source_id395', 
+				'source_id397', 
+				'source_id399', 
+				'source_id401', 
+				'source_id403', 
+				'source_id405', 
+				'source_id407', 
+				'source_id409', 
+				'source_id411', 
+				'source_id413', 
+				'source_id415', 
+				'source_id417', 
+				'source_id419', 
+				'source_id421', 
+				'source_id423', 
+				'source_id425', 
+				'source_id427', 
+				'source_id429', 
+				'source_id431', 
+				'source_id433', 
+				'source_id435', 
+				'source_id437', 
+				'source_id439', 
+				'source_id441', 
+				'source_id443', 
+				'source_id445', 
+				'source_id447', 
+				'source_id449', 
+				'source_id451', 
+				'source_id453', 
+				'source_id455', 
+				'source_id457', 
 				'source_id459', 
 				'source_id461', 
-				'source_id463', 
-				'source_id465', 
-				'source_id467', 
-				'source_id469', 
-				'source_id471', 
-				'source_id473', 
-				'source_id475', 
-				'source_id477', 
-				'source_id478');
+				'source_id462', 
+				'source_id464', 
+				'source_id466', 
+				'source_id468', 
+				'source_id470', 
+				'source_id472', 
+				'source_id474', 
+				'source_id476', 
+				'source_id478', 
+				'source_id479');
 
-        var instanceBoxes= new Array('instance_id27', 
-				'instance_id28', 
-				'instance_id35', 
+        var instanceBoxes= new Array('instance_id28', 
+				'instance_id29', 
 				'instance_id36', 
 				'instance_id37', 
-				'instance_id41', 
-				'instance_id50', 
-				'instance_id71', 
-				'instance_id75', 
-				'instance_id111', 
-				'instance_id112', 
-				'instance_id120', 
-				'instance_id121', 
-				'instance_id149', 
+				'instance_id38', 
+				'instance_id42', 
+				'instance_id51', 
+				'instance_id74', 
+				'instance_id78', 
+				'instance_id114', 
+				'instance_id115', 
+				'instance_id125', 
+				'instance_id126', 
+				'instance_id197', 
 				'instance_id204', 
-				'instance_id211', 
-				'instance_id212', 
+				'instance_id205', 
+				'instance_id217', 
 				'instance_id224', 
-				'instance_id231', 
-				'instance_id246', 
-				'instance_id270', 
-				'instance_id271', 
-				'instance_id288', 
-				'instance_id293', 
-				'instance_id301');
+				'instance_id239', 
+				'instance_id263', 
+				'instance_id264', 
+				'instance_id281', 
+				'instance_id286', 
+				'instance_id294');
 
-        var diagramBoxes= new Array('diagram_id27', 
-				'diagram_id28', 
+        var diagramBoxes= new Array('diagram_id28', 
 				'diagram_id29', 
 				'diagram_id30', 
 				'diagram_id31', 
-				'diagram_id35', 
+				'diagram_id32', 
 				'diagram_id36', 
 				'diagram_id37', 
 				'diagram_id38', 
@@ -1197,688 +1194,684 @@
 				'diagram_id40', 
 				'diagram_id41', 
 				'diagram_id42', 
-				'diagram_id50', 
+				'diagram_id43', 
 				'diagram_id51', 
 				'diagram_id52', 
-				'diagram_id54', 
-				'diagram_id56', 
-				'diagram_id58', 
+				'diagram_id53', 
+				'diagram_id55', 
+				'diagram_id57', 
 				'diagram_id59', 
-				'diagram_id61', 
+				'diagram_id60', 
 				'diagram_id62', 
-				'diagram_id64', 
+				'diagram_id63', 
 				'diagram_id65', 
-				'diagram_id67', 
-				'diagram_id69', 
-				'diagram_id71', 
+				'diagram_id66', 
+				'diagram_id68', 
+				'diagram_id70', 
 				'diagram_id72', 
-				'diagram_id73', 
 				'diagram_id74', 
 				'diagram_id75', 
 				'diagram_id76', 
-				'diagram_id87', 
-				'diagram_id95', 
-				'diagram_id107', 
-				'diagram_id111', 
-				'diagram_id112', 
-				'diagram_id113', 
+				'diagram_id77', 
+				'diagram_id78', 
+				'diagram_id79', 
+				'diagram_id90', 
+				'diagram_id98', 
+				'diagram_id110', 
+				'diagram_id114', 
+				'diagram_id115', 
 				'diagram_id116', 
-				'diagram_id120', 
 				'diagram_id121', 
-				'diagram_id122', 
-				'diagram_id130', 
-				'diagram_id136', 
-				'diagram_id149', 
-				'diagram_id150', 
-				'diagram_id154', 
+				'diagram_id125', 
+				'diagram_id126', 
+				'diagram_id127', 
+				'diagram_id134', 
+				'diagram_id141', 
+				'diagram_id179', 
+				'diagram_id180', 
+				'diagram_id182', 
+				'diagram_id184', 
 				'diagram_id186', 
-				'diagram_id187', 
+				'diagram_id188', 
 				'diagram_id189', 
+				'diagram_id190', 
 				'diagram_id191', 
+				'diagram_id192', 
 				'diagram_id193', 
-				'diagram_id195', 
-				'diagram_id196', 
+				'diagram_id194', 
 				'diagram_id197', 
 				'diagram_id198', 
-				'diagram_id199', 
-				'diagram_id200', 
-				'diagram_id201', 
 				'diagram_id204', 
 				'diagram_id205', 
-				'diagram_id211', 
-				'diagram_id212', 
+				'diagram_id206', 
 				'diagram_id213', 
+				'diagram_id217', 
+				'diagram_id218', 
 				'diagram_id220', 
+				'diagram_id222', 
 				'diagram_id224', 
-				'diagram_id225', 
-				'diagram_id227', 
-				'diagram_id229', 
-				'diagram_id231', 
-				'diagram_id233', 
-				'diagram_id246', 
-				'diagram_id247', 
-				'diagram_id258', 
-				'diagram_id267', 
-				'diagram_id270', 
-				'diagram_id271', 
-				'diagram_id272', 
-				'diagram_id288', 
-				'diagram_id293', 
-				'diagram_id301', 
+				'diagram_id226', 
+				'diagram_id239', 
+				'diagram_id240', 
+				'diagram_id251', 
+				'diagram_id260', 
+				'diagram_id263', 
+				'diagram_id264', 
+				'diagram_id265', 
+				'diagram_id281', 
+				'diagram_id286', 
+				'diagram_id294', 
+				'diagram_id295', 
 				'diagram_id302', 
-				'diagram_id309', 
-				'diagram_id313', 
+				'diagram_id306', 
+				'diagram_id310', 
+				'diagram_id314', 
 				'diagram_id317', 
-				'diagram_id321', 
-				'diagram_id324', 
 				'diagram_id2', 
 				'diagram_id3', 
-				'diagram_id53', 
-				'diagram_id55', 
-				'diagram_id57', 
-				'diagram_id60', 
-				'diagram_id63', 
-				'diagram_id66', 
-				'diagram_id68', 
-				'diagram_id70', 
-				'diagram_id188', 
-				'diagram_id190', 
-				'diagram_id192', 
-				'diagram_id194', 
-				'diagram_id232', 
 				'diagram_id4', 
+				'diagram_id54', 
+				'diagram_id56', 
+				'diagram_id58', 
+				'diagram_id61', 
+				'diagram_id64', 
+				'diagram_id67', 
+				'diagram_id69', 
+				'diagram_id71', 
+				'diagram_id73', 
+				'diagram_id181', 
+				'diagram_id183', 
+				'diagram_id185', 
+				'diagram_id187', 
+				'diagram_id225', 
 				'diagram_id5', 
-				'diagram_id7', 
+				'diagram_id6', 
 				'diagram_id8', 
-				'diagram_id10', 
-				'diagram_id12', 
-				'diagram_id14', 
-				'diagram_id16', 
-				'diagram_id18', 
-				'diagram_id20', 
-				'diagram_id22', 
-				'diagram_id32', 
+				'diagram_id9', 
+				'diagram_id11', 
+				'diagram_id13', 
+				'diagram_id15', 
+				'diagram_id17', 
+				'diagram_id19', 
+				'diagram_id21', 
+				'diagram_id23', 
 				'diagram_id33', 
-				'diagram_id43', 
-				'diagram_id46', 
-				'diagram_id48', 
-				'diagram_id77', 
-				'diagram_id78', 
+				'diagram_id34', 
+				'diagram_id44', 
+				'diagram_id47', 
+				'diagram_id49', 
 				'diagram_id80', 
-				'diagram_id85', 
+				'diagram_id81', 
+				'diagram_id83', 
 				'diagram_id88', 
-				'diagram_id89', 
 				'diagram_id91', 
-				'diagram_id93', 
+				'diagram_id92', 
+				'diagram_id94', 
 				'diagram_id96', 
-				'diagram_id97', 
-				'diagram_id98', 
+				'diagram_id99', 
 				'diagram_id100', 
 				'diagram_id101', 
+				'diagram_id103', 
 				'diagram_id104', 
-				'diagram_id108', 
-				'diagram_id114', 
-				'diagram_id115', 
+				'diagram_id107', 
+				'diagram_id111', 
 				'diagram_id117', 
 				'diagram_id118', 
+				'diagram_id119', 
+				'diagram_id122', 
 				'diagram_id123', 
-				'diagram_id124', 
-				'diagram_id126', 
 				'diagram_id128', 
-				'diagram_id131', 
-				'diagram_id132', 
-				'diagram_id134', 
-				'diagram_id137', 
+				'diagram_id130', 
+				'diagram_id135', 
+				'diagram_id136', 
 				'diagram_id138', 
-				'diagram_id140', 
 				'diagram_id142', 
+				'diagram_id143', 
+				'diagram_id145', 
 				'diagram_id147', 
-				'diagram_id151', 
-				'diagram_id152', 
-				'diagram_id155', 
-				'diagram_id157', 
-				'diagram_id159', 
-				'diagram_id162', 
-				'diagram_id163', 
-				'diagram_id202', 
-				'diagram_id206', 
+				'diagram_id153', 
+				'diagram_id154', 
+				'diagram_id195', 
+				'diagram_id199', 
+				'diagram_id200', 
+				'diagram_id201', 
 				'diagram_id207', 
 				'diagram_id208', 
+				'diagram_id209', 
+				'diagram_id211', 
 				'diagram_id214', 
 				'diagram_id215', 
-				'diagram_id216', 
-				'diagram_id218', 
+				'diagram_id219', 
 				'diagram_id221', 
-				'diagram_id222', 
-				'diagram_id226', 
+				'diagram_id223', 
+				'diagram_id227', 
 				'diagram_id228', 
-				'diagram_id230', 
+				'diagram_id229', 
+				'diagram_id231', 
+				'diagram_id232', 
 				'diagram_id234', 
-				'diagram_id235', 
-				'diagram_id236', 
-				'diagram_id238', 
-				'diagram_id239', 
 				'diagram_id241', 
-				'diagram_id248', 
-				'diagram_id249', 
-				'diagram_id259', 
-				'diagram_id260', 
-				'diagram_id262', 
-				'diagram_id263', 
-				'diagram_id265', 
-				'diagram_id268', 
-				'diagram_id273', 
+				'diagram_id242', 
+				'diagram_id252', 
+				'diagram_id253', 
+				'diagram_id255', 
+				'diagram_id256', 
+				'diagram_id258', 
+				'diagram_id261', 
+				'diagram_id266', 
+				'diagram_id267', 
+				'diagram_id270', 
+				'diagram_id271', 
 				'diagram_id274', 
 				'diagram_id277', 
 				'diagram_id278', 
-				'diagram_id281', 
-				'diagram_id284', 
-				'diagram_id285', 
-				'diagram_id289', 
-				'diagram_id290', 
-				'diagram_id294', 
-				'diagram_id295', 
+				'diagram_id282', 
+				'diagram_id283', 
+				'diagram_id287', 
+				'diagram_id288', 
+				'diagram_id296', 
+				'diagram_id297', 
 				'diagram_id303', 
 				'diagram_id304', 
-				'diagram_id310', 
+				'diagram_id307', 
+				'diagram_id308', 
 				'diagram_id311', 
-				'diagram_id314', 
+				'diagram_id312', 
 				'diagram_id315', 
+				'diagram_id316', 
 				'diagram_id318', 
 				'diagram_id319', 
+				'diagram_id321', 
 				'diagram_id322', 
-				'diagram_id323', 
-				'diagram_id325', 
 				'diagram_id326', 
 				'diagram_id328', 
-				'diagram_id329', 
-				'diagram_id333', 
-				'diagram_id335', 
-				'diagram_id337', 
-				'diagram_id339', 
-				'diagram_id341', 
+				'diagram_id330', 
+				'diagram_id332', 
+				'diagram_id334', 
+				'diagram_id336', 
+				'diagram_id338', 
+				'diagram_id340', 
+				'diagram_id342', 
 				'diagram_id343', 
+				'diagram_id344', 
 				'diagram_id345', 
-				'diagram_id347', 
+				'diagram_id346', 
+				'diagram_id348', 
 				'diagram_id349', 
 				'diagram_id350', 
 				'diagram_id351', 
 				'diagram_id352', 
-				'diagram_id353', 
-				'diagram_id355', 
+				'diagram_id354', 
 				'diagram_id356', 
-				'diagram_id357', 
 				'diagram_id358', 
-				'diagram_id359', 
-				'diagram_id361', 
+				'diagram_id360', 
+				'diagram_id362', 
 				'diagram_id363', 
+				'diagram_id364', 
 				'diagram_id365', 
+				'diagram_id366', 
 				'diagram_id367', 
+				'diagram_id368', 
 				'diagram_id369', 
-				'diagram_id370', 
 				'diagram_id371', 
 				'diagram_id372', 
-				'diagram_id373', 
 				'diagram_id374', 
-				'diagram_id375', 
 				'diagram_id376', 
 				'diagram_id378', 
 				'diagram_id379', 
 				'diagram_id381', 
 				'diagram_id383', 
 				'diagram_id385', 
-				'diagram_id386', 
-				'diagram_id388', 
-				'diagram_id390', 
-				'diagram_id392', 
-				'diagram_id394', 
-				'diagram_id396', 
-				'diagram_id398', 
-				'diagram_id400', 
-				'diagram_id402', 
-				'diagram_id404', 
-				'diagram_id406', 
-				'diagram_id408', 
-				'diagram_id410', 
-				'diagram_id412', 
-				'diagram_id414', 
-				'diagram_id416', 
-				'diagram_id418', 
-				'diagram_id420', 
-				'diagram_id422', 
-				'diagram_id424', 
-				'diagram_id426', 
-				'diagram_id428', 
-				'diagram_id430', 
-				'diagram_id432', 
-				'diagram_id434', 
-				'diagram_id436', 
-				'diagram_id438', 
-				'diagram_id440', 
-				'diagram_id442', 
-				'diagram_id444', 
-				'diagram_id446', 
-				'diagram_id448', 
-				'diagram_id450', 
-				'diagram_id452', 
-				'diagram_id454', 
-				'diagram_id456', 
-				'diagram_id458', 
+				'diagram_id387', 
+				'diagram_id389', 
+				'diagram_id391', 
+				'diagram_id393', 
+				'diagram_id395', 
+				'diagram_id397', 
+				'diagram_id399', 
+				'diagram_id401', 
+				'diagram_id403', 
+				'diagram_id405', 
+				'diagram_id407', 
+				'diagram_id409', 
+				'diagram_id411', 
+				'diagram_id413', 
+				'diagram_id415', 
+				'diagram_id417', 
+				'diagram_id419', 
+				'diagram_id421', 
+				'diagram_id423', 
+				'diagram_id425', 
+				'diagram_id427', 
+				'diagram_id429', 
+				'diagram_id431', 
+				'diagram_id433', 
+				'diagram_id435', 
+				'diagram_id437', 
+				'diagram_id439', 
+				'diagram_id441', 
+				'diagram_id443', 
+				'diagram_id445', 
+				'diagram_id447', 
+				'diagram_id449', 
+				'diagram_id451', 
+				'diagram_id453', 
+				'diagram_id455', 
+				'diagram_id457', 
 				'diagram_id459', 
 				'diagram_id461', 
-				'diagram_id463', 
-				'diagram_id465', 
-				'diagram_id467', 
-				'diagram_id469', 
-				'diagram_id471', 
-				'diagram_id473', 
-				'diagram_id475', 
-				'diagram_id477', 
-				'diagram_id478');
+				'diagram_id462', 
+				'diagram_id464', 
+				'diagram_id466', 
+				'diagram_id468', 
+				'diagram_id470', 
+				'diagram_id472', 
+				'diagram_id474', 
+				'diagram_id476', 
+				'diagram_id478', 
+				'diagram_id479');
 
-        var annotationBoxes= new Array('annotations_id27', 
-				'annotations_id28', 
+        var annotationBoxes= new Array('annotations_id28', 
 				'annotations_id29', 
 				'annotations_id30', 
 				'annotations_id31', 
-				'annotations_id35', 
+				'annotations_id32', 
 				'annotations_id36', 
 				'annotations_id37', 
 				'annotations_id38', 
-				'annotations_id40', 
+				'annotations_id39', 
 				'annotations_id41', 
-				'annotations_id50', 
-				'annotations_id52', 
-				'annotations_id56', 
-				'annotations_id62', 
-				'annotations_id65', 
-				'annotations_id67', 
-				'annotations_id69', 
-				'annotations_id71', 
+				'annotations_id42', 
+				'annotations_id51', 
+				'annotations_id53', 
+				'annotations_id57', 
+				'annotations_id63', 
+				'annotations_id68', 
+				'annotations_id70', 
 				'annotations_id72', 
-				'annotations_id73', 
 				'annotations_id74', 
 				'annotations_id75', 
 				'annotations_id76', 
-				'annotations_id87', 
-				'annotations_id95', 
-				'annotations_id111', 
-				'annotations_id112', 
-				'annotations_id113', 
+				'annotations_id77', 
+				'annotations_id78', 
+				'annotations_id79', 
+				'annotations_id90', 
+				'annotations_id98', 
+				'annotations_id114', 
+				'annotations_id115', 
 				'annotations_id116', 
-				'annotations_id120', 
 				'annotations_id121', 
-				'annotations_id122', 
-				'annotations_id149', 
-				'annotations_id150', 
-				'annotations_id154', 
+				'annotations_id125', 
+				'annotations_id126', 
+				'annotations_id127', 
+				'annotations_id134', 
+				'annotations_id179', 
+				'annotations_id180', 
+				'annotations_id182', 
+				'annotations_id184', 
 				'annotations_id186', 
-				'annotations_id187', 
+				'annotations_id188', 
 				'annotations_id189', 
+				'annotations_id190', 
 				'annotations_id191', 
+				'annotations_id192', 
 				'annotations_id193', 
-				'annotations_id195', 
-				'annotations_id196', 
+				'annotations_id194', 
 				'annotations_id197', 
 				'annotations_id198', 
-				'annotations_id199', 
-				'annotations_id200', 
-				'annotations_id201', 
 				'annotations_id204', 
 				'annotations_id205', 
-				'annotations_id211', 
-				'annotations_id212', 
+				'annotations_id206', 
 				'annotations_id213', 
+				'annotations_id217', 
+				'annotations_id218', 
 				'annotations_id220', 
+				'annotations_id222', 
 				'annotations_id224', 
-				'annotations_id225', 
-				'annotations_id227', 
-				'annotations_id229', 
-				'annotations_id231', 
-				'annotations_id233', 
-				'annotations_id246', 
-				'annotations_id247', 
-				'annotations_id258', 
-				'annotations_id267', 
-				'annotations_id270', 
-				'annotations_id271', 
-				'annotations_id272', 
-				'annotations_id288', 
-				'annotations_id293', 
-				'annotations_id301', 
+				'annotations_id226', 
+				'annotations_id239', 
+				'annotations_id240', 
+				'annotations_id251', 
+				'annotations_id260', 
+				'annotations_id263', 
+				'annotations_id264', 
+				'annotations_id265', 
+				'annotations_id281', 
+				'annotations_id286', 
+				'annotations_id294', 
+				'annotations_id295', 
 				'annotations_id302', 
-				'annotations_id309', 
-				'annotations_id313', 
+				'annotations_id306', 
+				'annotations_id310', 
+				'annotations_id314', 
 				'annotations_id317', 
-				'annotations_id321', 
-				'annotations_id324', 
-				'annotations_id6', 
-				'annotations_id17', 
-				'annotations_id49', 
-				'annotations_id79', 
-				'annotations_id81', 
+				'annotations_id7', 
+				'annotations_id18', 
+				'annotations_id50', 
 				'annotations_id82', 
-				'annotations_id83', 
-				'annotations_id90', 
-				'annotations_id92', 
-				'annotations_id102', 
-				'annotations_id103', 
+				'annotations_id84', 
+				'annotations_id85', 
+				'annotations_id86', 
+				'annotations_id93', 
+				'annotations_id95', 
 				'annotations_id105', 
 				'annotations_id106', 
+				'annotations_id108', 
 				'annotations_id109', 
-				'annotations_id119', 
-				'annotations_id125', 
-				'annotations_id127', 
+				'annotations_id112', 
+				'annotations_id120', 
+				'annotations_id124', 
 				'annotations_id129', 
+				'annotations_id131', 
+				'annotations_id132', 
 				'annotations_id133', 
-				'annotations_id135', 
+				'annotations_id137', 
 				'annotations_id139', 
-				'annotations_id141', 
-				'annotations_id143', 
+				'annotations_id140', 
 				'annotations_id144', 
-				'annotations_id145', 
 				'annotations_id146', 
 				'annotations_id148', 
-				'annotations_id153', 
+				'annotations_id149', 
+				'annotations_id150', 
+				'annotations_id151', 
+				'annotations_id152', 
+				'annotations_id155', 
 				'annotations_id156', 
-				'annotations_id158', 
-				'annotations_id160', 
-				'annotations_id161', 
-				'annotations_id164', 
-				'annotations_id165', 
-				'annotations_id180', 
-				'annotations_id181', 
-				'annotations_id182', 
-				'annotations_id184', 
-				'annotations_id203', 
-				'annotations_id209', 
-				'annotations_id217', 
+				'annotations_id171', 
+				'annotations_id172', 
+				'annotations_id173', 
+				'annotations_id174', 
+				'annotations_id175', 
+				'annotations_id176', 
+				'annotations_id177', 
+				'annotations_id196', 
+				'annotations_id202', 
+				'annotations_id210', 
+				'annotations_id230', 
+				'annotations_id235', 
+				'annotations_id236', 
 				'annotations_id237', 
-				'annotations_id242', 
 				'annotations_id243', 
 				'annotations_id244', 
-				'annotations_id250', 
-				'annotations_id251', 
-				'annotations_id261', 
-				'annotations_id266', 
+				'annotations_id254', 
+				'annotations_id259', 
+				'annotations_id268', 
+				'annotations_id269', 
+				'annotations_id272', 
+				'annotations_id273', 
 				'annotations_id275', 
 				'annotations_id276', 
 				'annotations_id279', 
 				'annotations_id280', 
-				'annotations_id282', 
-				'annotations_id283', 
-				'annotations_id286', 
-				'annotations_id287', 
-				'annotations_id292', 
-				'annotations_id296', 
-				'annotations_id297', 
+				'annotations_id285', 
+				'annotations_id289', 
+				'annotations_id290', 
+				'annotations_id298', 
+				'annotations_id299', 
 				'annotations_id305', 
-				'annotations_id306', 
-				'annotations_id312', 
-				'annotations_id316', 
-				'annotations_id320', 
-				'annotations_id334', 
-				'annotations_id340', 
-				'annotations_id342', 
-				'annotations_id344', 
-				'annotations_id346', 
-				'annotations_id348', 
-				'annotations_id360', 
-				'annotations_id380', 
-				'annotations_id393', 
-				'annotations_id397', 
-				'annotations_id401', 
-				'annotations_id429', 
-				'annotations_id431', 
-				'annotations_id435', 
-				'annotations_id443', 
-				'annotations_id445', 
-				'annotations_id447', 
-				'annotations_id449', 
-				'annotations_id451', 
-				'annotations_id453', 
-				'annotations_id455', 
-				'annotations_id457', 
-				'annotations_id462', 
-				'annotations_id464', 
-				'annotations_id466', 
-				'annotations_id468', 
-				'annotations_id470', 
-				'annotations_id472', 
-				'annotations_id479');
+				'annotations_id309', 
+				'annotations_id313', 
+				'annotations_id327', 
+				'annotations_id333', 
+				'annotations_id335', 
+				'annotations_id337', 
+				'annotations_id339', 
+				'annotations_id341', 
+				'annotations_id353', 
+				'annotations_id373', 
+				'annotations_id386', 
+				'annotations_id390', 
+				'annotations_id394', 
+				'annotations_id422', 
+				'annotations_id424', 
+				'annotations_id426', 
+				'annotations_id428', 
+				'annotations_id430', 
+				'annotations_id432', 
+				'annotations_id440', 
+				'annotations_id442', 
+				'annotations_id444', 
+				'annotations_id446', 
+				'annotations_id448', 
+				'annotations_id450', 
+				'annotations_id452', 
+				'annotations_id454', 
+				'annotations_id456', 
+				'annotations_id458', 
+				'annotations_id460', 
+				'annotations_id465', 
+				'annotations_id467', 
+				'annotations_id469', 
+				'annotations_id471', 
+				'annotations_id473', 
+				'annotations_id480');
 
-        var attributesBoxes= new Array('attributes_id27', 
-				'attributes_id28', 
-				'attributes_id35', 
+        var attributesBoxes= new Array('attributes_id28', 
+				'attributes_id29', 
 				'attributes_id36', 
-				'attributes_id41', 
+				'attributes_id37', 
 				'attributes_id42', 
-				'attributes_id71', 
-				'attributes_id75', 
-				'attributes_id76', 
-				'attributes_id87', 
-				'attributes_id95', 
-				'attributes_id107', 
-				'attributes_id113', 
+				'attributes_id43', 
+				'attributes_id74', 
+				'attributes_id78', 
+				'attributes_id79', 
+				'attributes_id90', 
+				'attributes_id98', 
+				'attributes_id110', 
 				'attributes_id116', 
 				'attributes_id121', 
-				'attributes_id122', 
-				'attributes_id130', 
-				'attributes_id136', 
-				'attributes_id149', 
-				'attributes_id150', 
-				'attributes_id154', 
-				'attributes_id205', 
+				'attributes_id126', 
+				'attributes_id127', 
+				'attributes_id134', 
+				'attributes_id141', 
+				'attributes_id198', 
+				'attributes_id206', 
 				'attributes_id213', 
+				'attributes_id218', 
 				'attributes_id220', 
-				'attributes_id225', 
-				'attributes_id227', 
-				'attributes_id229', 
-				'attributes_id231', 
-				'attributes_id233', 
-				'attributes_id247', 
-				'attributes_id258', 
-				'attributes_id267', 
-				'attributes_id271', 
-				'attributes_id272', 
-				'attributes_id288', 
-				'attributes_id293', 
-				'attributes_id301', 
+				'attributes_id222', 
+				'attributes_id224', 
+				'attributes_id226', 
+				'attributes_id240', 
+				'attributes_id251', 
+				'attributes_id260', 
+				'attributes_id264', 
+				'attributes_id265', 
+				'attributes_id281', 
+				'attributes_id286', 
+				'attributes_id294', 
+				'attributes_id295', 
 				'attributes_id302', 
-				'attributes_id309', 
-				'attributes_id313', 
+				'attributes_id306', 
+				'attributes_id310', 
+				'attributes_id314', 
 				'attributes_id317', 
-				'attributes_id321', 
-				'attributes_id324', 
-				'attributes_id4', 
 				'attributes_id5', 
-				'attributes_id7', 
+				'attributes_id6', 
 				'attributes_id8', 
-				'attributes_id10', 
-				'attributes_id12', 
-				'attributes_id14', 
-				'attributes_id16', 
-				'attributes_id18', 
-				'attributes_id20', 
-				'attributes_id22', 
-				'attributes_id32', 
+				'attributes_id9', 
+				'attributes_id11', 
+				'attributes_id13', 
+				'attributes_id15', 
+				'attributes_id17', 
+				'attributes_id19', 
+				'attributes_id21', 
+				'attributes_id23', 
 				'attributes_id33', 
-				'attributes_id43', 
-				'attributes_id46', 
-				'attributes_id48', 
-				'attributes_id77', 
-				'attributes_id78', 
+				'attributes_id34', 
+				'attributes_id44', 
+				'attributes_id47', 
+				'attributes_id49', 
 				'attributes_id80', 
-				'attributes_id85', 
+				'attributes_id81', 
+				'attributes_id83', 
 				'attributes_id88', 
-				'attributes_id89', 
 				'attributes_id91', 
-				'attributes_id93', 
+				'attributes_id92', 
+				'attributes_id94', 
 				'attributes_id96', 
-				'attributes_id97', 
-				'attributes_id98', 
+				'attributes_id99', 
 				'attributes_id100', 
 				'attributes_id101', 
+				'attributes_id103', 
 				'attributes_id104', 
-				'attributes_id108', 
-				'attributes_id114', 
-				'attributes_id115', 
+				'attributes_id107', 
+				'attributes_id111', 
 				'attributes_id117', 
 				'attributes_id118', 
+				'attributes_id119', 
+				'attributes_id122', 
 				'attributes_id123', 
-				'attributes_id124', 
-				'attributes_id126', 
 				'attributes_id128', 
-				'attributes_id131', 
-				'attributes_id132', 
-				'attributes_id134', 
-				'attributes_id137', 
+				'attributes_id130', 
+				'attributes_id135', 
+				'attributes_id136', 
 				'attributes_id138', 
-				'attributes_id140', 
 				'attributes_id142', 
+				'attributes_id143', 
+				'attributes_id145', 
 				'attributes_id147', 
-				'attributes_id151', 
-				'attributes_id152', 
-				'attributes_id155', 
-				'attributes_id157', 
-				'attributes_id159', 
-				'attributes_id162', 
-				'attributes_id163', 
-				'attributes_id202', 
-				'attributes_id206', 
+				'attributes_id153', 
+				'attributes_id154', 
+				'attributes_id195', 
+				'attributes_id199', 
+				'attributes_id200', 
+				'attributes_id201', 
 				'attributes_id207', 
 				'attributes_id208', 
+				'attributes_id209', 
+				'attributes_id211', 
 				'attributes_id214', 
 				'attributes_id215', 
-				'attributes_id216', 
-				'attributes_id218', 
+				'attributes_id219', 
 				'attributes_id221', 
-				'attributes_id222', 
-				'attributes_id226', 
+				'attributes_id223', 
+				'attributes_id227', 
 				'attributes_id228', 
-				'attributes_id230', 
+				'attributes_id229', 
+				'attributes_id231', 
+				'attributes_id232', 
 				'attributes_id234', 
-				'attributes_id235', 
-				'attributes_id236', 
-				'attributes_id238', 
-				'attributes_id239', 
 				'attributes_id241', 
-				'attributes_id248', 
-				'attributes_id249', 
-				'attributes_id259', 
-				'attributes_id260', 
-				'attributes_id262', 
-				'attributes_id263', 
-				'attributes_id265', 
-				'attributes_id268', 
-				'attributes_id273', 
+				'attributes_id242', 
+				'attributes_id252', 
+				'attributes_id253', 
+				'attributes_id255', 
+				'attributes_id256', 
+				'attributes_id258', 
+				'attributes_id261', 
+				'attributes_id266', 
+				'attributes_id267', 
+				'attributes_id270', 
+				'attributes_id271', 
 				'attributes_id274', 
 				'attributes_id277', 
 				'attributes_id278', 
-				'attributes_id281', 
-				'attributes_id284', 
-				'attributes_id285', 
-				'attributes_id289', 
-				'attributes_id290', 
-				'attributes_id294', 
-				'attributes_id295', 
+				'attributes_id282', 
+				'attributes_id283', 
+				'attributes_id287', 
+				'attributes_id288', 
+				'attributes_id296', 
+				'attributes_id297', 
 				'attributes_id303', 
 				'attributes_id304', 
-				'attributes_id310', 
+				'attributes_id307', 
+				'attributes_id308', 
 				'attributes_id311', 
-				'attributes_id314', 
+				'attributes_id312', 
 				'attributes_id315', 
+				'attributes_id316', 
 				'attributes_id318', 
 				'attributes_id319', 
+				'attributes_id321', 
 				'attributes_id322', 
-				'attributes_id323', 
-				'attributes_id325', 
 				'attributes_id326', 
 				'attributes_id328', 
-				'attributes_id329', 
-				'attributes_id333', 
-				'attributes_id335', 
-				'attributes_id337', 
-				'attributes_id339', 
-				'attributes_id341', 
+				'attributes_id330', 
+				'attributes_id332', 
+				'attributes_id334', 
+				'attributes_id336', 
+				'attributes_id338', 
+				'attributes_id340', 
+				'attributes_id342', 
 				'attributes_id343', 
+				'attributes_id344', 
 				'attributes_id345', 
-				'attributes_id347', 
+				'attributes_id346', 
+				'attributes_id348', 
 				'attributes_id349', 
 				'attributes_id350', 
 				'attributes_id351', 
 				'attributes_id352', 
-				'attributes_id353', 
-				'attributes_id355', 
+				'attributes_id354', 
 				'attributes_id356', 
-				'attributes_id357', 
 				'attributes_id358', 
-				'attributes_id359', 
-				'attributes_id361', 
+				'attributes_id360', 
+				'attributes_id362', 
 				'attributes_id363', 
+				'attributes_id364', 
 				'attributes_id365', 
+				'attributes_id366', 
 				'attributes_id367', 
+				'attributes_id368', 
 				'attributes_id369', 
-				'attributes_id370', 
 				'attributes_id371', 
 				'attributes_id372', 
-				'attributes_id373', 
 				'attributes_id374', 
-				'attributes_id375', 
 				'attributes_id376', 
 				'attributes_id378', 
 				'attributes_id379', 
 				'attributes_id381', 
 				'attributes_id383', 
 				'attributes_id385', 
-				'attributes_id386', 
-				'attributes_id388', 
-				'attributes_id390', 
-				'attributes_id392', 
-				'attributes_id394', 
-				'attributes_id396', 
-				'attributes_id398', 
-				'attributes_id400', 
-				'attributes_id402', 
-				'attributes_id404', 
-				'attributes_id406', 
-				'attributes_id408', 
-				'attributes_id410', 
-				'attributes_id412', 
-				'attributes_id414', 
-				'attributes_id416', 
-				'attributes_id418', 
-				'attributes_id420', 
-				'attributes_id422', 
-				'attributes_id424', 
-				'attributes_id426', 
-				'attributes_id428', 
-				'attributes_id430', 
-				'attributes_id432', 
-				'attributes_id434', 
-				'attributes_id436', 
-				'attributes_id438', 
-				'attributes_id440', 
-				'attributes_id442', 
-				'attributes_id444', 
-				'attributes_id446', 
-				'attributes_id448', 
-				'attributes_id450', 
-				'attributes_id452', 
-				'attributes_id454', 
-				'attributes_id456', 
-				'attributes_id458', 
+				'attributes_id387', 
+				'attributes_id389', 
+				'attributes_id391', 
+				'attributes_id393', 
+				'attributes_id395', 
+				'attributes_id397', 
+				'attributes_id399', 
+				'attributes_id401', 
+				'attributes_id403', 
+				'attributes_id405', 
+				'attributes_id407', 
+				'attributes_id409', 
+				'attributes_id411', 
+				'attributes_id413', 
+				'attributes_id415', 
+				'attributes_id417', 
+				'attributes_id419', 
+				'attributes_id421', 
+				'attributes_id423', 
+				'attributes_id425', 
+				'attributes_id427', 
+				'attributes_id429', 
+				'attributes_id431', 
+				'attributes_id433', 
+				'attributes_id435', 
+				'attributes_id437', 
+				'attributes_id439', 
+				'attributes_id441', 
+				'attributes_id443', 
+				'attributes_id445', 
+				'attributes_id447', 
+				'attributes_id449', 
+				'attributes_id451', 
+				'attributes_id453', 
+				'attributes_id455', 
+				'attributes_id457', 
 				'attributes_id459', 
 				'attributes_id461', 
-				'attributes_id463', 
-				'attributes_id465', 
-				'attributes_id467', 
-				'attributes_id469', 
-				'attributes_id471', 
-				'attributes_id473', 
-				'attributes_id475', 
-				'attributes_id477', 
-				'attributes_id478');
+				'attributes_id462', 
+				'attributes_id464', 
+				'attributes_id466', 
+				'attributes_id468', 
+				'attributes_id470', 
+				'attributes_id472', 
+				'attributes_id474', 
+				'attributes_id476', 
+				'attributes_id478', 
+				'attributes_id479');
 
         
         var button_prefix = 'button_';
@@ -2217,7 +2210,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id27"></a><div class="componentTitle">Element <span class="qname">image</span></div>
+      </table><a id="id28"></a><div class="componentTitle">Element <span class="qname">image</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -2236,13 +2229,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id27" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id28" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id27');"
+                                     onclick="switchState('annotations_id28');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id27" style="display:block">
+                           <div id="annotations_id28" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -2257,34 +2250,34 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id27" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id27');"
+                           <div class="floatRight"><input id="button_diagram_id28" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id28');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id27" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html112.jpeg"
-                                   usemap="#kiwi_46_html112" /><map name="kiwi_46_html112" id="kiwi_46_html112">
-                                 <area alt="kiwi0.tmp#id22" href="kiwi0.html#id22" coords="129,43,258,69" />
-                                 <area alt="kiwi0.tmp#id28" href="kiwi0.html#id28" coords="183,91,275,115" />
-                                 <area alt="kiwi0.tmp#id35" href="kiwi0.html#id35" coords="183,125,278,149" />
-                                 <area alt="kiwi0.tmp#id204" href="kiwi0.html#id204" coords="183,159,255,183" />
-                                 <area alt="kiwi0.tmp#id211" href="kiwi0.html#id211" coords="183,193,271,217" />
-                                 <area alt="kiwi0.tmp#id271" href="kiwi0.html#id271" coords="183,227,244,251" />
-                                 <area alt="kiwi0.tmp#id288" href="kiwi0.html#id288" coords="183,261,252,285" />
-                                 <area alt="kiwi0.tmp#id293" href="kiwi0.html#id293" coords="183,295,370,337" />
-                                 <area alt="kiwi0.tmp#id301" href="kiwi0.html#id301" coords="183,347,264,371" /></map></div>
+                           <div id="diagram_id28" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html233.jpeg"
+                                   usemap="#kiwi_46_html233" /><map name="kiwi_46_html233" id="kiwi_46_html233">
+                                 <area alt="kiwi0.tmp#id23" href="kiwi0.html#id23" coords="129,43,258,69" />
+                                 <area alt="kiwi0.tmp#id29" href="kiwi0.html#id29" coords="183,91,275,115" />
+                                 <area alt="kiwi0.tmp#id36" href="kiwi0.html#id36" coords="183,125,278,149" />
+                                 <area alt="kiwi0.tmp#id197" href="kiwi0.html#id197" coords="183,159,255,183" />
+                                 <area alt="kiwi0.tmp#id204" href="kiwi0.html#id204" coords="183,193,271,217" />
+                                 <area alt="kiwi0.tmp#id264" href="kiwi0.html#id264" coords="183,227,244,251" />
+                                 <area alt="kiwi0.tmp#id281" href="kiwi0.html#id281" coords="183,261,252,285" />
+                                 <area alt="kiwi0.tmp#id286" href="kiwi0.html#id286" coords="183,295,370,337" />
+                                 <area alt="kiwi0.tmp#id294" href="kiwi0.html#id294" coords="183,347,264,371" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id27" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id28" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id27');"
+                                     onclick="switchState('properties_id28');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id27" style="display:block">
+                           <div id="properties_id28" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -2298,37 +2291,37 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b> | <b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b> | <b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b> | <b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instsource</a></b> | <b><a href="kiwi0.html#id271" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">users</a></b> | <b><a href="kiwi0.html#id288" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">drivers</a></b> | <b><a href="kiwi0.html#id293" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repository</a></b> | <b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b> | <b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b> | <b><a href="kiwi0.html#id197" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b> | <b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instsource</a></b> | <b><a href="kiwi0.html#id264" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">users</a></b> | <b><a href="kiwi0.html#id281" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">drivers</a></b> | <b><a href="kiwi0.html#id286" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repository</a></b> | <b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packages</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b>, <b><a href="kiwi0.html#id288" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">drivers</a></b>, <b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instsource</a></b>, <b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packages</a></b>, <b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b>, <b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b>, <b><a href="kiwi0.html#id293" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repository</a></b>, <b><a href="kiwi0.html#id271" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b>, <b><a href="kiwi0.html#id281" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">drivers</a></b>, <b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instsource</a></b>, <b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packages</a></b>, <b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b>, <b><a href="kiwi0.html#id197" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b>, <b><a href="kiwi0.html#id286" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repository</a></b>, <b><a href="kiwi0.html#id264" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">users</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id27" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id27');"
+                           <div class="floatRight"><input id="button_instance_id28" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id28');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id27" style="display:block">
+                           <div id="instance_id28" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -2350,13 +2343,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id27" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id28" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id27');"
+                                     onclick="switchState('attributes_id28');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id27" style="display:block">
+                           <div id="attributes_id28" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -2369,7 +2362,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id24" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">displayname</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -2380,7 +2373,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id26" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td>restriction of <b>xs:string</b></td>
                                     <td></td>
@@ -2391,7 +2384,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id24" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id25" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">inherit</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -2402,7 +2395,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id25" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id26" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">kiwirevision</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -2413,9 +2406,10 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id7" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
-                                    <td></td>
+                                    <td><b><a href="kiwi0.html#id4" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image-name</a></b></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -2424,14 +2418,14 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">A name</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">An image name without / and spaces</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id17" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id18" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">schemaversion</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -2449,7 +2443,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi1.html#id11" target="mainFrame"
+                                    <td class="firstColumn"><b><a href="kiwi1.html#id12" target="mainFrame"
                                              title="http://www.w3.org/2001/XMLSchema-instance"
                                              onclick="updatePageTitle('Schema documentation for xsi.xsd')">xsi:noNamespaceSchemaLocation</a></b></td>
                                     <td><b>xs:anyURI</b></td>
@@ -2468,7 +2462,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi1.html#id13" target="mainFrame"
+                                    <td class="firstColumn"><b><a href="kiwi1.html#id14" target="mainFrame"
                                              title="http://www.w3.org/2001/XMLSchema-instance"
                                              onclick="updatePageTitle('Schema documentation for xsi.xsd')">xsi:schemaLocation</a></b></td>
                                     <td><b>xs:anyURI</b></td>
@@ -2486,12 +2480,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id27" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id27');"
+                           <div class="floatRight"><input id="button_source_id28" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id28');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id27" style="display:block">
+                           <div id="source_id28" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -2528,7 +2522,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id28"></a><div class="componentTitle">Element <span class="qname">description</span></div>
+      </table><a id="id29"></a><div class="componentTitle">Element <span class="qname">description</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -2547,13 +2541,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id28" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id29" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id28');"
+                                     onclick="switchState('annotations_id29');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id28" style="display:block">
+                           <div id="annotations_id29" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -2568,29 +2562,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id28" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id28');"
+                           <div class="floatRight"><input id="button_diagram_id29" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id29');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id28" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html199.jpeg"
-                                   usemap="#kiwi_46_html199" /><map name="kiwi_46_html199" id="kiwi_46_html199">
-                                 <area alt="kiwi0.tmp#id32" href="kiwi0.html#id32" coords="158,43,316,69" />
-                                 <area alt="kiwi0.tmp#id29" href="kiwi0.html#id29" coords="212,91,325,133" />
-                                 <area alt="kiwi0.tmp#id30" href="kiwi0.html#id30" coords="212,143,325,185" />
-                                 <area alt="kiwi0.tmp#id31" href="kiwi0.html#id31" coords="212,195,325,237" /></map></div>
+                           <div id="diagram_id29" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html273.jpeg"
+                                   usemap="#kiwi_46_html273" /><map name="kiwi_46_html273" id="kiwi_46_html273">
+                                 <area alt="kiwi0.tmp#id33" href="kiwi0.html#id33" coords="158,43,316,69" />
+                                 <area alt="kiwi0.tmp#id30" href="kiwi0.html#id30" coords="212,91,325,133" />
+                                 <area alt="kiwi0.tmp#id31" href="kiwi0.html#id31" coords="212,143,325,185" />
+                                 <area alt="kiwi0.tmp#id32" href="kiwi0.html#id32" coords="212,195,325,237" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id28" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id29" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id28');"
+                                     onclick="switchState('properties_id29');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id28" style="display:block">
+                           <div id="properties_id29" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -2605,16 +2599,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id28" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id28');"
+                           <div class="floatRight"><input id="button_usedBy_id29" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id29');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id28" style="display:block">
+                           <div id="usedBy_id29" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></td>
                                  </tr>
                               </table>
@@ -2623,27 +2617,27 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">author</a></b> | <b><a href="kiwi0.html#id30" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">contact</a></b> | <b><a href="kiwi0.html#id31" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id30" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">author</a></b> | <b><a href="kiwi0.html#id31" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">contact</a></b> | <b><a href="kiwi0.html#id32" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">specification</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">author</a></b>, <b><a href="kiwi0.html#id30" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">contact</a></b>, <b><a href="kiwi0.html#id31" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id30" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">author</a></b>, <b><a href="kiwi0.html#id31" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">contact</a></b>, <b><a href="kiwi0.html#id32" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">specification</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id28" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id28');"
+                           <div class="floatRight"><input id="button_instance_id29" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id29');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id28" style="display:block">
+                           <div id="instance_id29" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -2660,13 +2654,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id28" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id29" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id28');"
+                                     onclick="switchState('attributes_id29');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id28" style="display:block">
+                           <div id="attributes_id29" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -2679,7 +2673,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id34" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -2696,12 +2690,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id28" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id28');"
+                           <div class="floatRight"><input id="button_source_id29" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id29');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id28" style="display:block">
+                           <div id="source_id29" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -2733,7 +2727,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id29"></a><div class="componentTitle">Element <span class="qname">author</span></div>
+      </table><a id="id30"></a><div class="componentTitle">Element <span class="qname">author</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -2752,13 +2746,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id29" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id30" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id29');"
+                                     onclick="switchState('annotations_id30');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id29" style="display:block">
+                           <div id="annotations_id30" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -2773,12 +2767,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id29" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id29');"
+                           <div class="floatRight"><input id="button_diagram_id30" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id30');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id29" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html66.jpeg" /></div>
+                           <div id="diagram_id30" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html72.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -2788,13 +2782,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id29" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id30" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id29');"
+                                     onclick="switchState('properties_id30');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id29" style="display:block">
+                           <div id="properties_id30" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -2809,16 +2803,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id29" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id29');"
+                           <div class="floatRight"><input id="button_usedBy_id30" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id30');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id29" style="display:block">
+                           <div id="usedBy_id30" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b></td>
                                  </tr>
                               </table>
@@ -2828,12 +2822,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id29" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id29');"
+                           <div class="floatRight"><input id="button_source_id30" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id30');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id29" style="display:block">
+                           <div id="source_id30" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -2857,7 +2851,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id30"></a><div class="componentTitle">Element <span class="qname">contact</span></div>
+      </table><a id="id31"></a><div class="componentTitle">Element <span class="qname">contact</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -2876,13 +2870,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id30" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id31" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id30');"
+                                     onclick="switchState('annotations_id31');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id30" style="display:block">
+                           <div id="annotations_id31" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -2897,12 +2891,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id30" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id30');"
+                           <div class="floatRight"><input id="button_diagram_id31" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id31');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id30" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html268.jpeg" /></div>
+                           <div id="diagram_id31" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html268.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -2912,13 +2906,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id30" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id31" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id30');"
+                                     onclick="switchState('properties_id31');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id30" style="display:block">
+                           <div id="properties_id31" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -2933,16 +2927,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id30" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id30');"
+                           <div class="floatRight"><input id="button_usedBy_id31" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id31');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id30" style="display:block">
+                           <div id="usedBy_id31" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b></td>
                                  </tr>
                               </table>
@@ -2952,12 +2946,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id30" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id30');"
+                           <div class="floatRight"><input id="button_source_id31" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id31');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id30" style="display:block">
+                           <div id="source_id31" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -2981,7 +2975,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id31"></a><div class="componentTitle">Element <span class="qname">specification</span></div>
+      </table><a id="id32"></a><div class="componentTitle">Element <span class="qname">specification</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -3000,13 +2994,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id31" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id32" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id31');"
+                                     onclick="switchState('annotations_id32');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id31" style="display:block">
+                           <div id="annotations_id32" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -3021,12 +3015,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id31" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id31');"
+                           <div class="floatRight"><input id="button_diagram_id32" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id32');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id31" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html104.jpeg" /></div>
+                           <div id="diagram_id32" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html189.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -3036,13 +3030,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id31" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id32" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id31');"
+                                     onclick="switchState('properties_id32');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id31" style="display:block">
+                           <div id="properties_id32" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -3057,16 +3051,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id31" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id31');"
+                           <div class="floatRight"><input id="button_usedBy_id32" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id32');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id31" style="display:block">
+                           <div id="usedBy_id32" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b></td>
                                  </tr>
                               </table>
@@ -3076,12 +3070,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id31" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id31');"
+                           <div class="floatRight"><input id="button_source_id32" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id32');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id31" style="display:block">
+                           <div id="source_id32" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -3105,7 +3099,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id35"></a><div class="componentTitle">Element <span class="qname">preferences</span></div>
+      </table><a id="id36"></a><div class="componentTitle">Element <span class="qname">preferences</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -3124,13 +3118,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id35" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id36" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id35');"
+                                     onclick="switchState('annotations_id36');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id35" style="display:block">
+                           <div id="annotations_id36" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -3145,39 +3139,39 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id35" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id35');"
+                           <div class="floatRight"><input id="button_diagram_id36" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id36');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id35" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html118.jpeg"
-                                   usemap="#kiwi_46_html118" /><map name="kiwi_46_html118" id="kiwi_46_html118">
-                                 <area alt="kiwi0.tmp#id202" href="kiwi0.html#id202" coords="161,43,322,69" />
-                                 <area alt="kiwi0.tmp#id36" href="kiwi0.html#id36" coords="215,91,270,115" />
-                                 <area alt="kiwi0.tmp#id186" href="kiwi0.html#id186" coords="215,125,328,167" />
-                                 <area alt="kiwi0.tmp#id187" href="kiwi0.html#id187" coords="215,177,424,219" />
-                                 <area alt="kiwi0.tmp#id189" href="kiwi0.html#id189" coords="215,229,455,271" />
-                                 <area alt="kiwi0.tmp#id191" href="kiwi0.html#id191" coords="215,281,429,323" />
-                                 <area alt="kiwi0.tmp#id193" href="kiwi0.html#id193" coords="215,333,389,375" />
-                                 <area alt="kiwi0.tmp#id195" href="kiwi0.html#id195" coords="215,385,328,427" />
-                                 <area alt="kiwi0.tmp#id196" href="kiwi0.html#id196" coords="215,437,328,479" />
-                                 <area alt="kiwi0.tmp#id197" href="kiwi0.html#id197" coords="215,489,328,531" />
-                                 <area alt="kiwi0.tmp#id198" href="kiwi0.html#id198" coords="215,541,328,583" />
-                                 <area alt="kiwi0.tmp#id199" href="kiwi0.html#id199" coords="215,593,343,635" />
-                                 <area alt="kiwi0.tmp#id200" href="kiwi0.html#id200" coords="215,645,328,687" />
-                                 <area alt="kiwi0.tmp#id201" href="kiwi0.html#id201" coords="215,697,331,739" /></map></div>
+                           <div id="diagram_id36" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html135.jpeg"
+                                   usemap="#kiwi_46_html135" /><map name="kiwi_46_html135" id="kiwi_46_html135">
+                                 <area alt="kiwi0.tmp#id195" href="kiwi0.html#id195" coords="161,43,322,69" />
+                                 <area alt="kiwi0.tmp#id37" href="kiwi0.html#id37" coords="215,91,270,115" />
+                                 <area alt="kiwi0.tmp#id179" href="kiwi0.html#id179" coords="215,125,328,167" />
+                                 <area alt="kiwi0.tmp#id180" href="kiwi0.html#id180" coords="215,177,424,219" />
+                                 <area alt="kiwi0.tmp#id182" href="kiwi0.html#id182" coords="215,229,455,271" />
+                                 <area alt="kiwi0.tmp#id184" href="kiwi0.html#id184" coords="215,281,429,323" />
+                                 <area alt="kiwi0.tmp#id186" href="kiwi0.html#id186" coords="215,333,389,375" />
+                                 <area alt="kiwi0.tmp#id188" href="kiwi0.html#id188" coords="215,385,328,427" />
+                                 <area alt="kiwi0.tmp#id189" href="kiwi0.html#id189" coords="215,437,328,479" />
+                                 <area alt="kiwi0.tmp#id190" href="kiwi0.html#id190" coords="215,489,328,531" />
+                                 <area alt="kiwi0.tmp#id191" href="kiwi0.html#id191" coords="215,541,328,583" />
+                                 <area alt="kiwi0.tmp#id192" href="kiwi0.html#id192" coords="215,593,343,635" />
+                                 <area alt="kiwi0.tmp#id193" href="kiwi0.html#id193" coords="215,645,328,687" />
+                                 <area alt="kiwi0.tmp#id194" href="kiwi0.html#id194" coords="215,697,331,739" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id35" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id36" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id35');"
+                                     onclick="switchState('properties_id36');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id35" style="display:block">
+                           <div id="properties_id36" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -3192,16 +3186,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id35" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id35');"
+                           <div class="floatRight"><input id="button_usedBy_id36" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id36');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id35" style="display:block">
+                           <div id="usedBy_id36" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></td>
                                  </tr>
                               </table>
@@ -3210,52 +3204,52 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b> | <b><a href="kiwi0.html#id186" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">version</a></b> | <b><a href="kiwi0.html#id187" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packagemanager</a></b> | <b><a href="kiwi0.html#id189" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-check-signatures</a></b> | <b><a href="kiwi0.html#id191" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-excludedocs</a></b> | <b><a href="kiwi0.html#id193" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-force</a></b> | <b><a href="kiwi0.html#id195" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">keytable</a></b> | <b><a href="kiwi0.html#id196" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timezone</a></b> | <b><a href="kiwi0.html#id197" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">locale</a></b> | <b><a href="kiwi0.html#id198" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">boot-theme</a></b> | <b><a href="kiwi0.html#id199" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultdestination</a></b> | <b><a href="kiwi0.html#id200" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultroot</a></b> | <b><a href="kiwi0.html#id201" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b> | <b><a href="kiwi0.html#id179" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">version</a></b> | <b><a href="kiwi0.html#id180" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packagemanager</a></b> | <b><a href="kiwi0.html#id182" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-check-signatures</a></b> | <b><a href="kiwi0.html#id184" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-excludedocs</a></b> | <b><a href="kiwi0.html#id186" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-force</a></b> | <b><a href="kiwi0.html#id188" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">keytable</a></b> | <b><a href="kiwi0.html#id189" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timezone</a></b> | <b><a href="kiwi0.html#id190" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">locale</a></b> | <b><a href="kiwi0.html#id191" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">boot-theme</a></b> | <b><a href="kiwi0.html#id192" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultdestination</a></b> | <b><a href="kiwi0.html#id193" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultroot</a></b> | <b><a href="kiwi0.html#id194" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultbaseroot</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id198" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">boot-theme</a></b>, <b><a href="kiwi0.html#id201" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultbaseroot</a></b>, <b><a href="kiwi0.html#id199" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultdestination</a></b>, <b><a href="kiwi0.html#id200" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultroot</a></b>, <b><a href="kiwi0.html#id195" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">keytable</a></b>, <b><a href="kiwi0.html#id197" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">locale</a></b>, <b><a href="kiwi0.html#id187" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packagemanager</a></b>, <b><a href="kiwi0.html#id189" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-check-signatures</a></b>, <b><a href="kiwi0.html#id191" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-excludedocs</a></b>, <b><a href="kiwi0.html#id193" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-force</a></b>, <b><a href="kiwi0.html#id196" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timezone</a></b>, <b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b>, <b><a href="kiwi0.html#id186" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id191" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">boot-theme</a></b>, <b><a href="kiwi0.html#id194" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultbaseroot</a></b>, <b><a href="kiwi0.html#id192" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultdestination</a></b>, <b><a href="kiwi0.html#id193" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultroot</a></b>, <b><a href="kiwi0.html#id188" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">keytable</a></b>, <b><a href="kiwi0.html#id190" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">locale</a></b>, <b><a href="kiwi0.html#id180" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packagemanager</a></b>, <b><a href="kiwi0.html#id182" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-check-signatures</a></b>, <b><a href="kiwi0.html#id184" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-excludedocs</a></b>, <b><a href="kiwi0.html#id186" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-force</a></b>, <b><a href="kiwi0.html#id189" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timezone</a></b>, <b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b>, <b><a href="kiwi0.html#id179" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">version</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id35" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id35');"
+                           <div class="floatRight"><input id="button_instance_id36" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id36');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id35" style="display:block">
+                           <div id="instance_id36" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
                                     <td width="100%"><pre><span class="tokenElement"><preferences</span><span class="tokenText"> </span><span class="tokenAttrName">profiles=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><type</span><span class="tokenText"> </span><span class="tokenAttrName">baseroot=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">boot=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">bootkernel=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">bootloader=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">bootprofile=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">checkprebuilt=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">compressed=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">filesystem=</span><span class="tokenAttrValue">""</span><span class="t
 okenText"> </span><span class="tokenAttrName">flags=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">format=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">fsnocheck=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">fsreadonly=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">fsreadwrite=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">hybrid=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">hybridpersistent=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">image=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">kernelcmdline=</span><span 
 class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">luks=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">lvm=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">primary=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">vga=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">volid=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></type></span><span class="tokenIndent">
+  </span><span class="tokenElement"><type</span><span class="tokenText"> </span><span class="tokenAttrName">baseroot=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">boot=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">bootkernel=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">bootloader=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">bootprofile=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">checkprebuilt=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">compressed=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">filesystem=</span><span class="tokenAttrValue">""</span><span class="t
 okenText"> </span><span class="tokenAttrName">flags=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">format=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">fsnocheck=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">fsreadonly=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">fsreadwrite=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">hybrid=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">hybridpersistent=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">image=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">installiso=</span><span cla
 ss="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">installstick=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">kernelcmdline=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">luks=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">lvm=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">primary=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">vga=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">volid=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></type></span><span class="tokenInden
 t">
   </span><span class="tokenElement"><version</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></version></span><span class="tokenIndent">
   </span><span class="tokenElement"><packagemanager</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></packagemanager></span><span class="tokenIndent">
   </span><span class="tokenElement"><rpm-check-signatures</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></rpm-check-signatures></span><span class="tokenIndent">
@@ -3277,13 +3271,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id35" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id36" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id35');"
+                                     onclick="switchState('attributes_id36');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id35" style="display:block">
+                           <div id="attributes_id36" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -3296,7 +3290,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id203" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id196" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -3320,12 +3314,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id35" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id35');"
+                           <div class="floatRight"><input id="button_source_id36" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id36');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id35" style="display:block">
+                           <div id="source_id36" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -3367,7 +3361,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id36"></a><div class="componentTitle">Element <span class="qname">type</span></div>
+      </table><a id="id37"></a><div class="componentTitle">Element <span class="qname">type</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -3386,13 +3380,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id36" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id37" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id36');"
+                                     onclick="switchState('annotations_id37');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id36" style="display:block">
+                           <div id="annotations_id37" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -3407,34 +3401,33 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id36" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id36');"
+                           <div class="floatRight"><input id="button_diagram_id37" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id37');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id36" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html244.jpeg"
-                                   usemap="#kiwi_46_html244" /><map name="kiwi_46_html244" id="kiwi_46_html244">
-                                 <area alt="kiwi0.tmp#id162" href="kiwi0.html#id162" coords="121,43,241,69" />
-                                 <area alt="kiwi0.tmp#id37" href="kiwi0.html#id37" coords="175,91,259,115" />
-                                 <area alt="kiwi0.tmp#id41" href="kiwi0.html#id41" coords="175,125,270,149" />
-                                 <area alt="kiwi0.tmp#id50" href="kiwi0.html#id50" coords="175,159,263,183" />
-                                 <area alt="kiwi0.tmp#id71" href="kiwi0.html#id71" coords="175,193,262,217" />
-                                 <area alt="kiwi0.tmp#id107" href="kiwi0.html#id107" coords="175,227,437,269" />
-                                 <area alt="kiwi0.tmp#id111" href="kiwi0.html#id111" coords="175,279,230,303" />
-                                 <area alt="kiwi0.tmp#id121" href="kiwi0.html#id121" coords="175,313,281,337" />
-                                 <area alt="kiwi0.tmp#id149" href="kiwi0.html#id149" coords="175,347,260,371" /></map></div>
+                           <div id="diagram_id37" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html129.jpeg"
+                                   usemap="#kiwi_46_html129" /><map name="kiwi_46_html129" id="kiwi_46_html129">
+                                 <area alt="kiwi0.tmp#id153" href="kiwi0.html#id153" coords="121,43,241,69" />
+                                 <area alt="kiwi0.tmp#id38" href="kiwi0.html#id38" coords="175,91,259,115" />
+                                 <area alt="kiwi0.tmp#id42" href="kiwi0.html#id42" coords="175,125,270,149" />
+                                 <area alt="kiwi0.tmp#id51" href="kiwi0.html#id51" coords="175,159,263,183" />
+                                 <area alt="kiwi0.tmp#id74" href="kiwi0.html#id74" coords="175,193,262,217" />
+                                 <area alt="kiwi0.tmp#id110" href="kiwi0.html#id110" coords="175,227,437,269" />
+                                 <area alt="kiwi0.tmp#id114" href="kiwi0.html#id114" coords="175,279,230,303" />
+                                 <area alt="kiwi0.tmp#id126" href="kiwi0.html#id126" coords="175,313,251,337" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id36" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id37" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id36');"
+                                     onclick="switchState('properties_id37');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id36" style="display:block">
+                           <div id="properties_id37" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -3449,16 +3442,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id36" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id36');"
+                           <div class="floatRight"><input id="button_usedBy_id37" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id37');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id36" style="display:block">
+                           <div id="usedBy_id37" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -3467,49 +3460,46 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2config</a></b> | <b><a href="kiwi0.html#id41" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvmvolumes</a></b> | <b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b> | <b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b> | <b><a href="kiwi0.html#id107" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b> | <b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">split</a></b> | <b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwareconfig</a></b> | <b><a href="kiwi0.html#id149" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenconfig</a></b></td>
+                        <td><b><a href="kiwi0.html#id38" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2config</a></b> | <b><a href="kiwi0.html#id42" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvmvolumes</a></b> | <b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b> | <b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b> | <b><a href="kiwi0.html#id110" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b> | <b><a href="kiwi0.html#id114" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">split</a></b> | <b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">machine</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2config</a></b>, <b><a href="kiwi0.html#id41" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvmvolumes</a></b>, <b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b>, <b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b>, <b><a href="kiwi0.html#id107" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b>, <b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">split</a></b>, <b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwareconfig</a></b>, <b><a href="kiwi0.html#id149" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenconfig</a></b></td>
+                        <td><b><a href="kiwi0.html#id38" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2config</a></b>, <b><a href="kiwi0.html#id42" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvmvolumes</a></b>, <b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">machine</a></b>, <b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b>, <b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b>, <b><a href="kiwi0.html#id110" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b>, <b><a href="kiwi0.html#id114" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">split</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id36" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id36');"
+                           <div class="floatRight"><input id="button_instance_id37" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id37');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id36" style="display:block">
+                           <div id="instance_id37" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><type</span><span class="tokenText"> </span><span class="tokenAttrName">baseroot=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">boot=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">bootkernel=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">bootloader=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">bootprofile=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">checkprebuilt=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">compressed=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">filesystem=</span><sp
 an class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">flags=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">format=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">fsnocheck=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">fsreadonly=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">fsreadwrite=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">hybrid=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">hybridpersistent=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">image=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span 
 class="tokenAttrName">kernelcmdline=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">luks=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">lvm=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">primary=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">vga=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">volid=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><type</span><span class="tokenText"> </span><span class="tokenAttrName">baseroot=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">boot=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">bootkernel=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">bootloader=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">bootprofile=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">checkprebuilt=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">compressed=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">filesystem=</span><sp
 an class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">flags=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">format=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">fsnocheck=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">fsreadonly=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">fsreadwrite=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">hybrid=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">hybridpersistent=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">image=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span 
 class="tokenAttrName">installiso=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">installstick=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">kernelcmdline=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">luks=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">lvm=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">primary=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">vga=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">volid=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><ec2config</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></ec2config></span><span class="tokenIndent">
   </span><span class="tokenElement"><lvmvolumes</span><span class="tokenText"> </span><span class="tokenAttrName">lvmgroup=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></lvmvolumes></span><span class="tokenIndent">
   </span><span class="tokenElement"><oemconfig</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></oemconfig></span><span class="tokenIndent">
   </span><span class="tokenElement"><pxedeploy</span><span class="tokenText"> </span><span class="tokenAttrName">blocksize=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">server=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></pxedeploy></span><span class="tokenIndent">
   </span><span class="tokenElement"><size</span><span class="tokenText"> </span><span class="tokenAttrName">additive=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">unit=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></size></span><span class="tokenIndent">
   </span><span class="tokenElement"><split</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></split></span><span class="tokenIndent">
-  </span><span class="tokenElement"><vmwareconfig</span><span class="tokenText"> </span><span class="tokenAttrName">arch=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">guestOS=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">HWversion=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">memory=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">usb=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></vmwareconfig></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xenconfig</span><span class="tokenText"> </span><span class="tokenAttrName">domain=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">memory=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></xenconfig></span><span class="tokenIndent">
+  </span><span class="tokenElement"><machine</span><span class="tokenText"> </span><span class="tokenAttrName">arch=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">domain=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">guestOS=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">HWversion=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">memory=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></machine></span><span class="tokenIndent">
 </span><span class="tokenElement"></type></span></pre></td>
                                  </tr>
                               </table>
@@ -3519,13 +3509,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id36" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id37" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id36');"
+                                     onclick="switchState('attributes_id37');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id36" style="display:block">
+                           <div id="attributes_id37" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -3538,7 +3528,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id182" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id173" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">baseroot</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -3556,7 +3546,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id170" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id161" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">boot</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -3567,7 +3557,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id169" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id160" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootkernel</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -3578,7 +3568,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id175" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id166" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootloader</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -3589,7 +3579,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id168" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id159" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootprofile</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -3600,7 +3590,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id167" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id158" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">checkprebuilt</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -3611,7 +3601,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id176" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id167" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">compressed</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -3622,7 +3612,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id179" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id170" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">filesystem</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -3633,7 +3623,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id172" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id163" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">flags</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -3644,18 +3634,25 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id183" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id174" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">format</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
                                     <td></td>
                                     <td>optional</td>
                                     <td>
-                                       <div class="annotation"></div>
+                                       <div class="annotation">
+                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                                 class="preWrapContainer">
+                                             <tr>
+                                                <td width="100%"><pre><span class="tokenText">Specifies the format of the virtual disk.</span></pre></td>
+                                             </tr>
+                                          </table>
+                                       </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id165" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id156" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">fsnocheck</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -3673,7 +3670,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id180" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id171" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">fsreadonly</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -3691,7 +3688,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id181" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id172" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">fsreadwrite</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -3709,7 +3706,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id173" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id164" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">hybrid</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -3720,7 +3717,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id174" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id165" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">hybridpersistent</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -3731,7 +3728,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id164" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id155" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -3749,7 +3746,43 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id185" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id175" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">installiso</a></b></td>
+                                    <td><b>xs:boolean</b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>optional</td>
+                                    <td>
+                                       <div class="annotation">
+                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                                 class="preWrapContainer">
+                                             <tr>
+                                                <td width="100%"><pre><span class="tokenText">Specifies if a install iso should be created (oem only)</span></pre></td>
+                                             </tr>
+                                          </table>
+                                       </div>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id176" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">installstick</a></b></td>
+                                    <td><b>xs:boolean</b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>optional</td>
+                                    <td>
+                                       <div class="annotation">
+                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                                 class="preWrapContainer">
+                                             <tr>
+                                                <td width="100%"><pre><span class="tokenText">Specifies if a install stick should be created (oem only)</span></pre></td>
+                                             </tr>
+                                          </table>
+                                       </div>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id178" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">kernelcmdline</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -3760,7 +3793,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id178" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id169" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">luks</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -3771,7 +3804,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id166" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id157" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvm</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -3782,7 +3815,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id184" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id177" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">primary</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -3800,7 +3833,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id177" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id168" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vga</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -3811,7 +3844,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id171" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volid</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -3828,12 +3861,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id36" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id36');"
+                           <div class="floatRight"><input id="button_source_id37" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id37');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id36" style="display:block">
+                           <div id="source_id37" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -3849,8 +3882,7 @@
       </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"pxedeploy"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"size"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"split"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"vmwareconfig"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"xenconfig"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"machine"</span><span class="tokenElement">/></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:choice></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.type.attlist"</span><span class="tokenElement">/></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:complexType></span><span class="tokenIndent">
@@ -3870,7 +3902,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id37"></a><div class="componentTitle">Element <span class="qname">ec2config</span></div>
+      </table><a id="id38"></a><div class="componentTitle">Element <span class="qname">ec2config</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -3889,13 +3921,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id37" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id38" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id37');"
+                                     onclick="switchState('annotations_id38');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id37" style="display:block">
+                           <div id="annotations_id38" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -3910,28 +3942,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id37" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id37');"
+                           <div class="floatRight"><input id="button_diagram_id38" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id38');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id37" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html211.jpeg"
-                                   usemap="#kiwi_46_html211" /><map name="kiwi_46_html211" id="kiwi_46_html211">
-                                 <area alt="kiwi0.tmp#id38" href="kiwi0.html#id38" coords="204,2,390,44" />
-                                 <area alt="kiwi0.tmp#id39" href="kiwi0.html#id39" coords="204,54,317,96" />
-                                 <area alt="kiwi0.tmp#id40" href="kiwi0.html#id40" coords="204,106,325,148" /></map></div>
+                           <div id="diagram_id38" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html26.jpeg" usemap="#kiwi_46_html26" /><map name="kiwi_46_html26" id="kiwi_46_html26">
+                                 <area alt="kiwi0.tmp#id39" href="kiwi0.html#id39" coords="204,2,390,44" />
+                                 <area alt="kiwi0.tmp#id40" href="kiwi0.html#id40" coords="204,54,317,96" />
+                                 <area alt="kiwi0.tmp#id41" href="kiwi0.html#id41" coords="204,106,325,148" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id37" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id38" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id37');"
+                                     onclick="switchState('properties_id38');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id37" style="display:block">
+                           <div id="properties_id38" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -3946,16 +3977,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id37" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id37');"
+                           <div class="floatRight"><input id="button_usedBy_id38" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id38');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id37" style="display:block">
+                           <div id="usedBy_id38" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                  </tr>
                               </table>
@@ -3964,27 +3995,27 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id38" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2accountnr</a></b> | <b><a href="kiwi0.html#id39" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2certfile</a></b> | <b><a href="kiwi0.html#id40" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id39" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2accountnr</a></b> | <b><a href="kiwi0.html#id40" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2certfile</a></b> | <b><a href="kiwi0.html#id41" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2privatekeyfile</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id38" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2accountnr</a></b>, <b><a href="kiwi0.html#id39" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2certfile</a></b>, <b><a href="kiwi0.html#id40" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id39" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2accountnr</a></b>, <b><a href="kiwi0.html#id40" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2certfile</a></b>, <b><a href="kiwi0.html#id41" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2privatekeyfile</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id37" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id37');"
+                           <div class="floatRight"><input id="button_instance_id38" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id38');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id37" style="display:block">
+                           <div id="instance_id38" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -4001,12 +4032,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id37" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id37');"
+                           <div class="floatRight"><input id="button_source_id38" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id38');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id37" style="display:block">
+                           <div id="source_id38" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -4037,7 +4068,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id38"></a><div class="componentTitle">Element <span class="qname">ec2accountnr</span></div>
+      </table><a id="id39"></a><div class="componentTitle">Element <span class="qname">ec2accountnr</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -4056,13 +4087,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id38" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id39" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id38');"
+                                     onclick="switchState('annotations_id39');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id38" style="display:block">
+                           <div id="annotations_id39" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -4077,12 +4108,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id38" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id38');"
+                           <div class="floatRight"><input id="button_diagram_id39" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id39');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id38" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html46.jpeg" /></div>
+                           <div id="diagram_id39" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html238.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -4092,13 +4123,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id38" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id39" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id38');"
+                                     onclick="switchState('properties_id39');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id38" style="display:block">
+                           <div id="properties_id39" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -4113,16 +4144,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id38" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id38');"
+                           <div class="floatRight"><input id="button_usedBy_id39" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id39');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id38" style="display:block">
+                           <div id="usedBy_id39" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id38" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2config</a></b></td>
                                  </tr>
                               </table>
@@ -4132,12 +4163,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id38" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id38');"
+                           <div class="floatRight"><input id="button_source_id39" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id39');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id38" style="display:block">
+                           <div id="source_id39" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -4161,7 +4192,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id39"></a><div class="componentTitle">Element <span class="qname">ec2certfile</span></div>
+      </table><a id="id40"></a><div class="componentTitle">Element <span class="qname">ec2certfile</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -4180,12 +4211,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id39" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id39');"
+                           <div class="floatRight"><input id="button_diagram_id40" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id40');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id39" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html37.jpeg" /></div>
+                           <div id="diagram_id40" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html104.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -4195,13 +4226,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id39" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id40" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id39');"
+                                     onclick="switchState('properties_id40');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id39" style="display:block">
+                           <div id="properties_id40" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -4216,16 +4247,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id39" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id39');"
+                           <div class="floatRight"><input id="button_usedBy_id40" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id40');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id39" style="display:block">
+                           <div id="usedBy_id40" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id38" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2config</a></b></td>
                                  </tr>
                               </table>
@@ -4235,12 +4266,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id39" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id39');"
+                           <div class="floatRight"><input id="button_source_id40" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id40');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id39" style="display:block">
+                           <div id="source_id40" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -4260,7 +4291,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id40"></a><div class="componentTitle">Element <span class="qname">ec2privatekeyfile</span></div>
+      </table><a id="id41"></a><div class="componentTitle">Element <span class="qname">ec2privatekeyfile</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -4279,13 +4310,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id40" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id41" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id40');"
+                                     onclick="switchState('annotations_id41');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id40" style="display:block">
+                           <div id="annotations_id41" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -4300,12 +4331,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id40" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id40');"
+                           <div class="floatRight"><input id="button_diagram_id41" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id41');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id40" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html123.jpeg" /></div>
+                           <div id="diagram_id41" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html32.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -4315,13 +4346,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id40" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id41" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id40');"
+                                     onclick="switchState('properties_id41');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id40" style="display:block">
+                           <div id="properties_id41" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -4336,16 +4367,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id40" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id40');"
+                           <div class="floatRight"><input id="button_usedBy_id41" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id41');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id40" style="display:block">
+                           <div id="usedBy_id41" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id38" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2config</a></b></td>
                                  </tr>
                               </table>
@@ -4355,12 +4386,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id40" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id40');"
+                           <div class="floatRight"><input id="button_source_id41" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id41');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id40" style="display:block">
+                           <div id="source_id41" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -4384,7 +4415,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id41"></a><div class="componentTitle">Element <span class="qname">lvmvolumes</span></div>
+      </table><a id="id42"></a><div class="componentTitle">Element <span class="qname">lvmvolumes</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -4403,13 +4434,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id41" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id42" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id41');"
+                                     onclick="switchState('annotations_id42');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id41" style="display:block">
+                           <div id="annotations_id42" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -4424,27 +4455,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id41" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id41');"
+                           <div class="floatRight"><input id="button_diagram_id42" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id42');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id41" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html140.jpeg"
-                                   usemap="#kiwi_46_html140" /><map name="kiwi_46_html140" id="kiwi_46_html140">
-                                 <area alt="kiwi0.tmp#id48" href="kiwi0.html#id48" coords="140,43,301,69" />
-                                 <area alt="kiwi0.tmp#id42" href="kiwi0.html#id42" coords="215,95,285,119" /></map></div>
+                           <div id="diagram_id42" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html282.jpeg"
+                                   usemap="#kiwi_46_html282" /><map name="kiwi_46_html282" id="kiwi_46_html282">
+                                 <area alt="kiwi0.tmp#id49" href="kiwi0.html#id49" coords="140,43,301,69" />
+                                 <area alt="kiwi0.tmp#id43" href="kiwi0.html#id43" coords="215,95,285,119" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id41" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id42" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id41');"
+                                     onclick="switchState('properties_id42');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id41" style="display:block">
+                           <div id="properties_id42" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -4459,16 +4490,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id41" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id41');"
+                           <div class="floatRight"><input id="button_usedBy_id42" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id42');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id41" style="display:block">
+                           <div id="usedBy_id42" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                  </tr>
                               </table>
@@ -4477,23 +4508,23 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id42" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volume*</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id42" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volume</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id41" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id41');"
+                           <div class="floatRight"><input id="button_instance_id42" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id42');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id41" style="display:block">
+                           <div id="instance_id42" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -4508,13 +4539,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id41" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id42" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id41');"
+                                     onclick="switchState('attributes_id42');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id41" style="display:block">
+                           <div id="attributes_id42" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -4527,7 +4558,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id49" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvmgroup</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -4551,12 +4582,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id41" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id41');"
+                           <div class="floatRight"><input id="button_source_id42" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id42');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id41" style="display:block">
+                           <div id="source_id42" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -4586,7 +4617,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id42"></a><div class="componentTitle">Element <span class="qname">volume</span></div>
+      </table><a id="id43"></a><div class="componentTitle">Element <span class="qname">volume</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -4605,25 +4636,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id42" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id42');"
+                           <div class="floatRight"><input id="button_diagram_id43" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id43');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id42" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html29.jpeg" usemap="#kiwi_46_html29" /><map name="kiwi_46_html29" id="kiwi_46_html29">
-                                 <area alt="kiwi0.tmp#id43" href="kiwi0.html#id43" coords="115,43,251,69" /></map></div>
+                           <div id="diagram_id43" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html98.jpeg" usemap="#kiwi_46_html98" /><map name="kiwi_46_html98" id="kiwi_46_html98">
+                                 <area alt="kiwi0.tmp#id44" href="kiwi0.html#id44" coords="115,43,251,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id42" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id43" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id42');"
+                                     onclick="switchState('properties_id43');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id42" style="display:block">
+                           <div id="properties_id43" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -4638,16 +4669,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id42" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id42');"
+                           <div class="floatRight"><input id="button_usedBy_id43" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id43');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id42" style="display:block">
+                           <div id="usedBy_id43" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id41" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id42" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvmvolumes</a></b></td>
                                  </tr>
                               </table>
@@ -4657,13 +4688,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id42" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id43" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id42');"
+                                     onclick="switchState('attributes_id43');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id42" style="display:block">
+                           <div id="attributes_id43" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -4676,7 +4707,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id44" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id45" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">freespace</a></b></td>
                                     <td><b><a href="kiwi0.html#id3" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volume-size-type</a></b></td>
@@ -4688,7 +4719,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id47" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id48" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -4699,7 +4730,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id45" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id46" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b></td>
                                     <td><b><a href="kiwi0.html#id3" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volume-size-type</a></b></td>
@@ -4717,12 +4748,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id42" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id42');"
+                           <div class="floatRight"><input id="button_source_id43" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id43');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id42" style="display:block">
+                           <div id="source_id43" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -4746,7 +4777,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id50"></a><div class="componentTitle">Element <span class="qname">oemconfig</span></div>
+      </table><a id="id51"></a><div class="componentTitle">Element <span class="qname">oemconfig</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -4765,13 +4796,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id50" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id51" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id50');"
+                                     onclick="switchState('annotations_id51');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id50" style="display:block">
+                           <div id="annotations_id51" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -4786,37 +4817,37 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id50" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id50');"
+                           <div class="floatRight"><input id="button_diagram_id51" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id51');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id50" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html100.jpeg"
-                                   usemap="#kiwi_46_html100" /><map name="kiwi_46_html100" id="kiwi_46_html100">
-                                 <area alt="kiwi0.tmp#id51" href="kiwi0.html#id51" coords="208,2,394,44" />
-                                 <area alt="kiwi0.tmp#id52" href="kiwi0.html#id52" coords="208,54,382,96" />
-                                 <area alt="kiwi0.tmp#id54" href="kiwi0.html#id54" coords="208,106,439,148" />
-                                 <area alt="kiwi0.tmp#id56" href="kiwi0.html#id56" coords="208,158,385,200" />
-                                 <area alt="kiwi0.tmp#id58" href="kiwi0.html#id58" coords="208,210,321,252" />
-                                 <area alt="kiwi0.tmp#id59" href="kiwi0.html#id59" coords="208,262,410,304" />
-                                 <area alt="kiwi0.tmp#id61" href="kiwi0.html#id61" coords="208,314,394,356" />
-                                 <area alt="kiwi0.tmp#id62" href="kiwi0.html#id62" coords="208,366,402,408" />
-                                 <area alt="kiwi0.tmp#id64" href="kiwi0.html#id64" coords="208,418,394,460" />
-                                 <area alt="kiwi0.tmp#id65" href="kiwi0.html#id65" coords="208,470,391,512" />
-                                 <area alt="kiwi0.tmp#id67" href="kiwi0.html#id67" coords="208,522,406,564" />
-                                 <area alt="kiwi0.tmp#id69" href="kiwi0.html#id69" coords="208,574,416,616" /></map></div>
+                           <div id="diagram_id51" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html79.jpeg" usemap="#kiwi_46_html79" /><map name="kiwi_46_html79" id="kiwi_46_html79">
+                                 <area alt="kiwi0.tmp#id52" href="kiwi0.html#id52" coords="208,2,394,44" />
+                                 <area alt="kiwi0.tmp#id53" href="kiwi0.html#id53" coords="208,54,382,96" />
+                                 <area alt="kiwi0.tmp#id55" href="kiwi0.html#id55" coords="208,106,439,148" />
+                                 <area alt="kiwi0.tmp#id57" href="kiwi0.html#id57" coords="208,158,385,200" />
+                                 <area alt="kiwi0.tmp#id59" href="kiwi0.html#id59" coords="208,210,321,252" />
+                                 <area alt="kiwi0.tmp#id60" href="kiwi0.html#id60" coords="208,262,410,304" />
+                                 <area alt="kiwi0.tmp#id62" href="kiwi0.html#id62" coords="208,314,394,356" />
+                                 <area alt="kiwi0.tmp#id63" href="kiwi0.html#id63" coords="208,366,402,408" />
+                                 <area alt="kiwi0.tmp#id65" href="kiwi0.html#id65" coords="208,418,394,460" />
+                                 <area alt="kiwi0.tmp#id66" href="kiwi0.html#id66" coords="208,470,446,512" />
+                                 <area alt="kiwi0.tmp#id68" href="kiwi0.html#id68" coords="208,522,391,564" />
+                                 <area alt="kiwi0.tmp#id70" href="kiwi0.html#id70" coords="208,574,406,616" />
+                                 <area alt="kiwi0.tmp#id72" href="kiwi0.html#id72" coords="208,626,416,668" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id50" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id51" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id50');"
+                                     onclick="switchState('properties_id51');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id50" style="display:block">
+                           <div id="properties_id51" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -4831,16 +4862,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id50" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id50');"
+                           <div class="floatRight"><input id="button_usedBy_id51" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id51');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id50" style="display:block">
+                           <div id="usedBy_id51" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                  </tr>
                               </table>
@@ -4849,45 +4880,47 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-systemsize</a></b> | <b><a href="kiwi0.html#id52" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swap</a></b> | <b><a href="kiwi0.html#id54" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-partition-install</a></b> | <b><a href="kiwi0.html#id56" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-home</a></b> | <b><a href="kiwi0.html#id58" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-boot-title</a></b> | <b><a href="kiwi0.html#id59" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-kiwi-initrd</a></b> | <b><a href="kiwi0.html#id61" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swapsize</a></b> | <b><a href="kiwi0.html#id62" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recovery</a></b> | <b><a href="kiwi0.html#id64" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recoveryID</a></b> | <b><a href="kiwi0.html#id65" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-reboot</a></b> | <b><a href="kiwi0.html#id67" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-dumphalt</a></b> | <b><a href="kiwi0.html#id69" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id52" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-systemsize</a></b> | <b><a href="kiwi0.html#id53" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swap</a></b> | <b><a href="kiwi0.html#id55" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-partition-install</a></b> | <b><a href="kiwi0.html#id57" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-home</a></b> | <b><a href="kiwi0.html#id59" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-boot-title</a></b> | <b><a href="kiwi0.html#id60" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-kiwi-initrd</a></b> | <b><a href="kiwi0.html#id62" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swapsize</a></b> | <b><a href="kiwi0.html#id63" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recovery</a></b> | <b><a href="kiwi0.html#id65" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recoveryID</a></b> | <b><a href="kiwi0.html#id66" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-inplace-recovery</a></b> | <b><a href="kiwi0.html#id68" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-reboot</a></b> | <b><a href="kiwi0.html#id70" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-dumphalt</a></b> | <b><a href="kiwi0.html#id72" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-unattended</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id58" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-boot-title</a></b>, <b><a href="kiwi0.html#id67" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-dumphalt</a></b>, <b><a href="kiwi0.html#id56" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-home</a></b>, <b><a href="kiwi0.html#id59" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-kiwi-initrd</a></b>, <b><a href="kiwi0.html#id54" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-partition-install</a></b>, <b><a href="kiwi0.html#id65" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-reboot</a></b>, <b><a href="kiwi0.html#id62" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recovery</a></b>, <b><a href="kiwi0.html#id64" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recoveryID</a></b>, <b><a href="kiwi0.html#id52" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swap</a></b>, <b><a href="kiwi0.html#id61" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swapsize</a></b>, <b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-systemsize</a></b>, <b><a href="kiwi0.html#id69" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id59" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-boot-title</a></b>, <b><a href="kiwi0.html#id70" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-dumphalt</a></b>, <b><a href="kiwi0.html#id57" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-home</a></b>, <b><a href="kiwi0.html#id66" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-inplace-recovery</a></b>, <b><a href="kiwi0.html#id60" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-kiwi-initrd</a></b>, <b><a href="kiwi0.html#id55" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-partition-install</a></b>, <b><a href="kiwi0.html#id68" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-reboot</a></b>, <b><a href="kiwi0.html#id63" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recovery</a></b>, <b><a href="kiwi0.html#id65" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recoveryID</a></b>, <b><a href="kiwi0.html#id53" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swap</a></b>, <b><a href="kiwi0.html#id62" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swapsize</a></b>, <b><a href="kiwi0.html#id52" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-systemsize</a></b>, <b><a href="kiwi0.html#id72" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-unattended</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id50" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id50');"
+                           <div class="floatRight"><input id="button_instance_id51" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id51');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id50" style="display:block">
+                           <div id="instance_id51" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -4901,6 +4934,7 @@
   </span><span class="tokenElement"><oem-swapsize</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></oem-swapsize></span><span class="tokenIndent">
   </span><span class="tokenElement"><oem-recovery</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></oem-recovery></span><span class="tokenIndent">
   </span><span class="tokenElement"><oem-recoveryID</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></oem-recoveryID></span><span class="tokenIndent">
+  </span><span class="tokenElement"><oem-inplace-recovery</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></oem-inplace-recovery></span><span class="tokenIndent">
   </span><span class="tokenElement"><oem-reboot</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></oem-reboot></span><span class="tokenIndent">
   </span><span class="tokenElement"><oem-dumphalt</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></oem-dumphalt></span><span class="tokenIndent">
   </span><span class="tokenElement"><oem-unattended</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></oem-unattended></span><span class="tokenIndent">
@@ -4913,12 +4947,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id50" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id50');"
+                           <div class="floatRight"><input id="button_source_id51" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id51');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id50" style="display:block">
+                           <div id="source_id51" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -4937,6 +4971,7 @@
       </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"oem-swapsize"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"oem-recovery"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"oem-recoveryID"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"oem-inplace-recovery"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"oem-reboot"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"oem-dumphalt"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"oem-unattended"</span><span class="tokenElement">/></span><span class="tokenIndent">
@@ -4958,7 +4993,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id51"></a><div class="componentTitle">Element <span class="qname">oem-systemsize</span></div>
+      </table><a id="id52"></a><div class="componentTitle">Element <span class="qname">oem-systemsize</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -4977,12 +5012,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id51" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id51');"
+                           <div class="floatRight"><input id="button_diagram_id52" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id52');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id51" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html86.jpeg" /></div>
+                           <div id="diagram_id52" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html22.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -4992,13 +5027,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id51" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id52" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id51');"
+                                     onclick="switchState('properties_id52');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id51" style="display:block">
+                           <div id="properties_id52" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -5013,16 +5048,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id51" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id51');"
+                           <div class="floatRight"><input id="button_usedBy_id52" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id52');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id51" style="display:block">
+                           <div id="usedBy_id52" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></td>
                                  </tr>
                               </table>
@@ -5032,12 +5067,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id51" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id51');"
+                           <div class="floatRight"><input id="button_source_id52" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id52');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id51" style="display:block">
+                           <div id="source_id52" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -5057,7 +5092,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id52"></a><div class="componentTitle">Element <span class="qname">oem-swap</span></div>
+      </table><a id="id53"></a><div class="componentTitle">Element <span class="qname">oem-swap</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -5076,13 +5111,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id52" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id53" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id52');"
+                                     onclick="switchState('annotations_id53');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id52" style="display:block">
+                           <div id="annotations_id53" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -5097,30 +5132,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id52" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id52');"
+                           <div class="floatRight"><input id="button_diagram_id53" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id53');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id52" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html6.jpeg" usemap="#kiwi_46_html6" /><map name="kiwi_46_html6" id="kiwi_46_html6">
-                                 <area alt="kiwi0.tmp#id53" href="kiwi0.html#id53" coords="202,8,366,34" /></map></div>
+                           <div id="diagram_id53" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html262.jpeg"
+                                   usemap="#kiwi_46_html262" /><map name="kiwi_46_html262" id="kiwi_46_html262">
+                                 <area alt="kiwi0.tmp#id54" href="kiwi0.html#id54" coords="202,8,366,34" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b><a href="kiwi0.html#id53" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id54" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-swap.content</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id52" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id53" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id52');"
+                                     onclick="switchState('properties_id53');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id52" style="display:block">
+                           <div id="properties_id53" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -5135,16 +5171,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id52" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id52');"
+                           <div class="floatRight"><input id="button_usedBy_id53" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id53');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id52" style="display:block">
+                           <div id="usedBy_id53" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></td>
                                  </tr>
                               </table>
@@ -5154,12 +5190,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id52" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id52');"
+                           <div class="floatRight"><input id="button_source_id53" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id53');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id52" style="display:block">
+                           <div id="source_id53" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -5183,7 +5219,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id54"></a><div class="componentTitle">Element <span class="qname">oem-partition-install</span></div>
+      </table><a id="id55"></a><div class="componentTitle">Element <span class="qname">oem-partition-install</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -5202,30 +5238,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id54" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id54');"
+                           <div class="floatRight"><input id="button_diagram_id55" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id55');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id54" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html62.jpeg" usemap="#kiwi_46_html62" /><map name="kiwi_46_html62" id="kiwi_46_html62">
-                                 <area alt="kiwi0.tmp#id55" href="kiwi0.html#id55" coords="259,8,480,34" /></map></div>
+                           <div id="diagram_id55" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html145.jpeg"
+                                   usemap="#kiwi_46_html145" /><map name="kiwi_46_html145" id="kiwi_46_html145">
+                                 <area alt="kiwi0.tmp#id56" href="kiwi0.html#id56" coords="259,8,480,34" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b><a href="kiwi0.html#id55" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id56" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-partition-install.content</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id54" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id55" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id54');"
+                                     onclick="switchState('properties_id55');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id54" style="display:block">
+                           <div id="properties_id55" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -5240,16 +5277,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id54" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id54');"
+                           <div class="floatRight"><input id="button_usedBy_id55" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id55');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id54" style="display:block">
+                           <div id="usedBy_id55" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></td>
                                  </tr>
                               </table>
@@ -5259,12 +5296,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id54" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id54');"
+                           <div class="floatRight"><input id="button_source_id55" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id55');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id54" style="display:block">
+                           <div id="source_id55" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -5284,7 +5321,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id56"></a><div class="componentTitle">Element <span class="qname">oem-home</span></div>
+      </table><a id="id57"></a><div class="componentTitle">Element <span class="qname">oem-home</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -5303,13 +5340,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id56" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id57" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id56');"
+                                     onclick="switchState('annotations_id57');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id56" style="display:block">
+                           <div id="annotations_id57" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -5324,30 +5361,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id56" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id56');"
+                           <div class="floatRight"><input id="button_diagram_id57" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id57');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id56" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html56.jpeg" usemap="#kiwi_46_html56" /><map name="kiwi_46_html56" id="kiwi_46_html56">
-                                 <area alt="kiwi0.tmp#id57" href="kiwi0.html#id57" coords="205,8,372,34" /></map></div>
+                           <div id="diagram_id57" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html108.jpeg"
+                                   usemap="#kiwi_46_html108" /><map name="kiwi_46_html108" id="kiwi_46_html108">
+                                 <area alt="kiwi0.tmp#id58" href="kiwi0.html#id58" coords="205,8,372,34" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b><a href="kiwi0.html#id57" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id58" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-home.content</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id56" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id57" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id56');"
+                                     onclick="switchState('properties_id57');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id56" style="display:block">
+                           <div id="properties_id57" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -5362,16 +5400,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id56" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id56');"
+                           <div class="floatRight"><input id="button_usedBy_id57" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id57');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id56" style="display:block">
+                           <div id="usedBy_id57" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></td>
                                  </tr>
                               </table>
@@ -5381,12 +5419,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id56" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id56');"
+                           <div class="floatRight"><input id="button_source_id57" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id57');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id56" style="display:block">
+                           <div id="source_id57" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -5410,7 +5448,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id58"></a><div class="componentTitle">Element <span class="qname">oem-boot-title</span></div>
+      </table><a id="id59"></a><div class="componentTitle">Element <span class="qname">oem-boot-title</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -5429,12 +5467,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id58" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id58');"
+                           <div class="floatRight"><input id="button_diagram_id59" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id59');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id58" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html65.jpeg" /></div>
+                           <div id="diagram_id59" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html184.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -5444,13 +5482,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id58" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id59" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id58');"
+                                     onclick="switchState('properties_id59');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id58" style="display:block">
+                           <div id="properties_id59" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -5465,16 +5503,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id58" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id58');"
+                           <div class="floatRight"><input id="button_usedBy_id59" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id59');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id58" style="display:block">
+                           <div id="usedBy_id59" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></td>
                                  </tr>
                               </table>
@@ -5484,12 +5522,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id58" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id58');"
+                           <div class="floatRight"><input id="button_source_id59" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id59');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id58" style="display:block">
+                           <div id="source_id59" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -5509,7 +5547,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id59"></a><div class="componentTitle">Element <span class="qname">oem-kiwi-initrd</span></div>
+      </table><a id="id60"></a><div class="componentTitle">Element <span class="qname">oem-kiwi-initrd</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -5528,31 +5566,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id59" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id59');"
+                           <div class="floatRight"><input id="button_diagram_id60" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id60');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id59" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html254.jpeg"
-                                   usemap="#kiwi_46_html254" /><map name="kiwi_46_html254" id="kiwi_46_html254">
-                                 <area alt="kiwi0.tmp#id60" href="kiwi0.html#id60" coords="230,8,422,34" /></map></div>
+                           <div id="diagram_id60" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html229.jpeg"
+                                   usemap="#kiwi_46_html229" /><map name="kiwi_46_html229" id="kiwi_46_html229">
+                                 <area alt="kiwi0.tmp#id61" href="kiwi0.html#id61" coords="230,8,422,34" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b><a href="kiwi0.html#id60" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id61" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-kiwi-initrd.content</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id59" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id60" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id59');"
+                                     onclick="switchState('properties_id60');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id59" style="display:block">
+                           <div id="properties_id60" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -5567,16 +5605,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id59" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id59');"
+                           <div class="floatRight"><input id="button_usedBy_id60" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id60');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id59" style="display:block">
+                           <div id="usedBy_id60" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></td>
                                  </tr>
                               </table>
@@ -5586,12 +5624,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id59" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id59');"
+                           <div class="floatRight"><input id="button_source_id60" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id60');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id59" style="display:block">
+                           <div id="source_id60" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -5611,7 +5649,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id61"></a><div class="componentTitle">Element <span class="qname">oem-swapsize</span></div>
+      </table><a id="id62"></a><div class="componentTitle">Element <span class="qname">oem-swapsize</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -5630,12 +5668,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id61" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id61');"
+                           <div class="floatRight"><input id="button_diagram_id62" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id62');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id61" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html13.jpeg" /></div>
+                           <div id="diagram_id62" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html127.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -5645,13 +5683,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id61" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id62" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id61');"
+                                     onclick="switchState('properties_id62');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id61" style="display:block">
+                           <div id="properties_id62" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -5666,16 +5704,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id61" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id61');"
+                           <div class="floatRight"><input id="button_usedBy_id62" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id62');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id61" style="display:block">
+                           <div id="usedBy_id62" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></td>
                                  </tr>
                               </table>
@@ -5685,12 +5723,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id61" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id61');"
+                           <div class="floatRight"><input id="button_source_id62" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id62');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id61" style="display:block">
+                           <div id="source_id62" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -5710,7 +5748,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id62"></a><div class="componentTitle">Element <span class="qname">oem-recovery</span></div>
+      </table><a id="id63"></a><div class="componentTitle">Element <span class="qname">oem-recovery</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -5729,13 +5767,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id62" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id63" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id62');"
+                                     onclick="switchState('annotations_id63');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id62" style="display:block">
+                           <div id="annotations_id63" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -5750,31 +5788,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id62" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id62');"
+                           <div class="floatRight"><input id="button_diagram_id63" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id63');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id62" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html131.jpeg"
-                                   usemap="#kiwi_46_html131" /><map name="kiwi_46_html131" id="kiwi_46_html131">
-                                 <area alt="kiwi0.tmp#id63" href="kiwi0.html#id63" coords="222,8,406,34" /></map></div>
+                           <div id="diagram_id63" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html148.jpeg"
+                                   usemap="#kiwi_46_html148" /><map name="kiwi_46_html148" id="kiwi_46_html148">
+                                 <area alt="kiwi0.tmp#id64" href="kiwi0.html#id64" coords="222,8,406,34" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b><a href="kiwi0.html#id63" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id64" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-recovery.content</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id62" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id63" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id62');"
+                                     onclick="switchState('properties_id63');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id62" style="display:block">
+                           <div id="properties_id63" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -5789,16 +5827,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id62" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id62');"
+                           <div class="floatRight"><input id="button_usedBy_id63" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id63');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id62" style="display:block">
+                           <div id="usedBy_id63" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></td>
                                  </tr>
                               </table>
@@ -5808,12 +5846,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id62" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id62');"
+                           <div class="floatRight"><input id="button_source_id63" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id63');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id62" style="display:block">
+                           <div id="source_id63" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -5837,7 +5875,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id64"></a><div class="componentTitle">Element <span class="qname">oem-recoveryID</span></div>
+      </table><a id="id65"></a><div class="componentTitle">Element <span class="qname">oem-recoveryID</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -5856,12 +5894,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id64" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id64');"
+                           <div class="floatRight"><input id="button_diagram_id65" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id65');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id64" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html161.jpeg" /></div>
+                           <div id="diagram_id65" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html251.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -5871,13 +5909,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id64" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id65" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id64');"
+                                     onclick="switchState('properties_id65');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id64" style="display:block">
+                           <div id="properties_id65" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -5892,16 +5930,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id64" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id64');"
+                           <div class="floatRight"><input id="button_usedBy_id65" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id65');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id64" style="display:block">
+                           <div id="usedBy_id65" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></td>
                                  </tr>
                               </table>
@@ -5911,12 +5949,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id64" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id64');"
+                           <div class="floatRight"><input id="button_source_id65" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id65');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id64" style="display:block">
+                           <div id="source_id65" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -5936,7 +5974,109 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id65"></a><div class="componentTitle">Element <span class="qname">oem-reboot</span></div>
+      </table><a id="id66"></a><div class="componentTitle">Element <span class="qname">oem-inplace-recovery</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>No namespace</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Diagram</b></div>
+                           <div class="floatRight"><input id="button_diagram_id66" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id66');"
+                                     class="control" /></div>
+                        </td>
+                        <td class="diagram">
+                           <div id="diagram_id66" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html279.jpeg"
+                                   usemap="#kiwi_46_html279" /><map name="kiwi_46_html279" id="kiwi_46_html279">
+                                 <area alt="kiwi0.tmp#id67" href="kiwi0.html#id67" coords="266,8,494,34" /></map></div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td><b><a href="kiwi0.html#id67" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-inplace-recovery.content</a></b></td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Properties</b></div>
+                           <div class="floatRight"><input id="button_properties_id66" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('properties_id66');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="properties_id66" style="display:block">
+                              <table class="propertiesTable">
+                                 <tr>
+                                    <td class="firstColumn">content:
+                                       
+                                    </td>
+                                    <td><b>simple</b></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Used by</b></div>
+                           <div class="floatRight"><input id="button_usedBy_id66" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id66');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="usedBy_id66" style="display:block">
+                              <table class="usedByTable">
+                                 <tr>
+                                    <td class="firstColumn">Element </td>
+                                    <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id66" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id66');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="source_id66" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
+                                 <tr>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"oem-inplace-recovery"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"k.oem-inplace-recovery.content"</span><span class="tokenElement">/></span></pre></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id68"></a><div class="componentTitle">Element <span class="qname">oem-reboot</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -5955,13 +6095,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id65" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id68" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id65');"
+                                     onclick="switchState('annotations_id68');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id65" style="display:block">
+                           <div id="annotations_id68" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -5976,30 +6116,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id65" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id65');"
+                           <div class="floatRight"><input id="button_diagram_id68" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id68');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id65" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html91.jpeg" usemap="#kiwi_46_html91" /><map name="kiwi_46_html91" id="kiwi_46_html91">
-                                 <area alt="kiwi0.tmp#id66" href="kiwi0.html#id66" coords="211,8,384,34" /></map></div>
+                           <div id="diagram_id68" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html92.jpeg" usemap="#kiwi_46_html92" /><map name="kiwi_46_html92" id="kiwi_46_html92">
+                                 <area alt="kiwi0.tmp#id69" href="kiwi0.html#id69" coords="211,8,384,34" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b><a href="kiwi0.html#id66" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id69" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-reboot.content</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id65" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id68" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id65');"
+                                     onclick="switchState('properties_id68');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id65" style="display:block">
+                           <div id="properties_id68" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -6014,16 +6154,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id65" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id65');"
+                           <div class="floatRight"><input id="button_usedBy_id68" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id68');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id65" style="display:block">
+                           <div id="usedBy_id68" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></td>
                                  </tr>
                               </table>
@@ -6033,12 +6173,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id65" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id65');"
+                           <div class="floatRight"><input id="button_source_id68" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id68');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id65" style="display:block">
+                           <div id="source_id68" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -6062,7 +6202,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id67"></a><div class="componentTitle">Element <span class="qname">oem-dumphalt</span></div>
+      </table><a id="id70"></a><div class="componentTitle">Element <span class="qname">oem-dumphalt</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -6081,13 +6221,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id67" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id70" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id67');"
+                                     onclick="switchState('annotations_id70');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id67" style="display:block">
+                           <div id="annotations_id70" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -6102,30 +6242,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id67" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id67');"
+                           <div class="floatRight"><input id="button_diagram_id70" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id70');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id67" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html76.jpeg" usemap="#kiwi_46_html76" /><map name="kiwi_46_html76" id="kiwi_46_html76">
-                                 <area alt="kiwi0.tmp#id68" href="kiwi0.html#id68" coords="226,8,414,34" /></map></div>
+                           <div id="diagram_id70" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html6.jpeg" usemap="#kiwi_46_html6" /><map name="kiwi_46_html6" id="kiwi_46_html6">
+                                 <area alt="kiwi0.tmp#id71" href="kiwi0.html#id71" coords="226,8,414,34" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b><a href="kiwi0.html#id68" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-dumphalt.content</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id67" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id70" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id67');"
+                                     onclick="switchState('properties_id70');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id67" style="display:block">
+                           <div id="properties_id70" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -6140,16 +6280,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id67" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id67');"
+                           <div class="floatRight"><input id="button_usedBy_id70" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id70');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id67" style="display:block">
+                           <div id="usedBy_id70" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></td>
                                  </tr>
                               </table>
@@ -6159,12 +6299,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id67" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id67');"
+                           <div class="floatRight"><input id="button_source_id70" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id70');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id67" style="display:block">
+                           <div id="source_id70" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -6188,7 +6328,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id69"></a><div class="componentTitle">Element <span class="qname">oem-unattended</span></div>
+      </table><a id="id72"></a><div class="componentTitle">Element <span class="qname">oem-unattended</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -6207,13 +6347,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id69" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id72" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id69');"
+                                     onclick="switchState('annotations_id72');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id69" style="display:block">
+                           <div id="annotations_id72" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -6228,31 +6368,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id69" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id69');"
+                           <div class="floatRight"><input id="button_diagram_id72" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id72');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id69" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html147.jpeg"
-                                   usemap="#kiwi_46_html147" /><map name="kiwi_46_html147" id="kiwi_46_html147">
-                                 <area alt="kiwi0.tmp#id70" href="kiwi0.html#id70" coords="236,8,434,34" /></map></div>
+                           <div id="diagram_id72" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html192.jpeg"
+                                   usemap="#kiwi_46_html192" /><map name="kiwi_46_html192" id="kiwi_46_html192">
+                                 <area alt="kiwi0.tmp#id73" href="kiwi0.html#id73" coords="236,8,434,34" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b><a href="kiwi0.html#id70" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id73" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-unattended.content</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id69" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id72" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id69');"
+                                     onclick="switchState('properties_id72');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id69" style="display:block">
+                           <div id="properties_id72" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -6267,16 +6407,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id69" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id69');"
+                           <div class="floatRight"><input id="button_usedBy_id72" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id72');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id69" style="display:block">
+                           <div id="usedBy_id72" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></td>
                                  </tr>
                               </table>
@@ -6286,12 +6426,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id69" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id69');"
+                           <div class="floatRight"><input id="button_source_id72" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id72');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id69" style="display:block">
+                           <div id="source_id72" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -6315,7 +6455,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id71"></a><div class="componentTitle">Element <span class="qname">pxedeploy</span></div>
+      </table><a id="id74"></a><div class="componentTitle">Element <span class="qname">pxedeploy</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -6334,13 +6474,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id71" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id74" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id71');"
+                                     onclick="switchState('annotations_id74');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id71" style="display:block">
+                           <div id="annotations_id74" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -6355,32 +6495,32 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id71" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id71');"
+                           <div class="floatRight"><input id="button_diagram_id74" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id74');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id71" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html215.jpeg"
-                                   usemap="#kiwi_46_html215" /><map name="kiwi_46_html215" id="kiwi_46_html215">
-                                 <area alt="kiwi0.tmp#id104" href="kiwi0.html#id104" coords="153,43,306,69" />
-                                 <area alt="kiwi0.tmp#id72" href="kiwi0.html#id72" coords="207,91,320,133" />
-                                 <area alt="kiwi0.tmp#id73" href="kiwi0.html#id73" coords="207,143,320,185" />
-                                 <area alt="kiwi0.tmp#id74" href="kiwi0.html#id74" coords="207,195,320,237" />
-                                 <area alt="kiwi0.tmp#id75" href="kiwi0.html#id75" coords="207,247,290,271" />
-                                 <area alt="kiwi0.tmp#id87" href="kiwi0.html#id87" coords="207,281,269,305" />
-                                 <area alt="kiwi0.tmp#id95" href="kiwi0.html#id95" coords="207,315,311,339" /></map></div>
+                           <div id="diagram_id74" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html280.jpeg"
+                                   usemap="#kiwi_46_html280" /><map name="kiwi_46_html280" id="kiwi_46_html280">
+                                 <area alt="kiwi0.tmp#id107" href="kiwi0.html#id107" coords="153,43,306,69" />
+                                 <area alt="kiwi0.tmp#id75" href="kiwi0.html#id75" coords="207,91,320,133" />
+                                 <area alt="kiwi0.tmp#id76" href="kiwi0.html#id76" coords="207,143,320,185" />
+                                 <area alt="kiwi0.tmp#id77" href="kiwi0.html#id77" coords="207,195,320,237" />
+                                 <area alt="kiwi0.tmp#id78" href="kiwi0.html#id78" coords="207,247,290,271" />
+                                 <area alt="kiwi0.tmp#id90" href="kiwi0.html#id90" coords="207,281,269,305" />
+                                 <area alt="kiwi0.tmp#id98" href="kiwi0.html#id98" coords="207,315,311,339" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id71" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id74" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id71');"
+                                     onclick="switchState('properties_id74');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id71" style="display:block">
+                           <div id="properties_id74" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -6395,16 +6535,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id71" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id71');"
+                           <div class="floatRight"><input id="button_usedBy_id74" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id74');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id71" style="display:block">
+                           <div id="usedBy_id74" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                  </tr>
                               </table>
@@ -6413,33 +6553,33 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id72" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timeout</a></b> | <b><a href="kiwi0.html#id73" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">kernel</a></b> | <b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">initrd</a></b> | <b><a href="kiwi0.html#id75" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partitions</a></b> | <b><a href="kiwi0.html#id87" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">union</a></b> | <b><a href="kiwi0.html#id95" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id75" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timeout</a></b> | <b><a href="kiwi0.html#id76" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">kernel</a></b> | <b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">initrd</a></b> | <b><a href="kiwi0.html#id78" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partitions</a></b> | <b><a href="kiwi0.html#id90" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">union</a></b> | <b><a href="kiwi0.html#id98" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">configuration</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id95" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">configuration</a></b>, <b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">initrd</a></b>, <b><a href="kiwi0.html#id73" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">kernel</a></b>, <b><a href="kiwi0.html#id75" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partitions</a></b>, <b><a href="kiwi0.html#id72" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timeout</a></b>, <b><a href="kiwi0.html#id87" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id98" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">configuration</a></b>, <b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">initrd</a></b>, <b><a href="kiwi0.html#id76" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">kernel</a></b>, <b><a href="kiwi0.html#id78" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partitions</a></b>, <b><a href="kiwi0.html#id75" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timeout</a></b>, <b><a href="kiwi0.html#id90" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">union</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id71" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id71');"
+                           <div class="floatRight"><input id="button_instance_id74" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id74');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id71" style="display:block">
+                           <div id="instance_id74" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -6459,13 +6599,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id71" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id74" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id71');"
+                                     onclick="switchState('attributes_id74');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id71" style="display:block">
+                           <div id="attributes_id74" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -6478,7 +6618,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id106" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id109" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">blocksize</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -6496,7 +6636,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id105" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id108" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">server</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -6520,12 +6660,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id71" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id71');"
+                           <div class="floatRight"><input id="button_source_id74" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id74');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id71" style="display:block">
+                           <div id="source_id74" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -6560,7 +6700,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id72"></a><div class="componentTitle">Element <span class="qname">timeout</span></div>
+      </table><a id="id75"></a><div class="componentTitle">Element <span class="qname">timeout</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -6579,13 +6719,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id72" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id75" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id72');"
+                                     onclick="switchState('annotations_id75');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id72" style="display:block">
+                           <div id="annotations_id75" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -6600,12 +6740,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id72" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id72');"
+                           <div class="floatRight"><input id="button_diagram_id75" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id75');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id72" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html227.jpeg" /></div>
+                           <div id="diagram_id75" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html281.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -6615,13 +6755,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id72" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id75" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id72');"
+                                     onclick="switchState('properties_id75');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id72" style="display:block">
+                           <div id="properties_id75" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -6636,16 +6776,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id72" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id72');"
+                           <div class="floatRight"><input id="button_usedBy_id75" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id75');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id72" style="display:block">
+                           <div id="usedBy_id75" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b></td>
                                  </tr>
                               </table>
@@ -6655,12 +6795,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id72" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id72');"
+                           <div class="floatRight"><input id="button_source_id75" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id75');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id72" style="display:block">
+                           <div id="source_id75" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -6684,7 +6824,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id73"></a><div class="componentTitle">Element <span class="qname">kernel</span></div>
+      </table><a id="id76"></a><div class="componentTitle">Element <span class="qname">kernel</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -6703,13 +6843,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id73" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id76" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id73');"
+                                     onclick="switchState('annotations_id76');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id73" style="display:block">
+                           <div id="annotations_id76" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -6724,12 +6864,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id73" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id73');"
+                           <div class="floatRight"><input id="button_diagram_id76" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id76');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id73" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html187.jpeg" /></div>
+                           <div id="diagram_id76" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html167.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -6739,13 +6879,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id73" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id76" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id73');"
+                                     onclick="switchState('properties_id76');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id73" style="display:block">
+                           <div id="properties_id76" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -6760,16 +6900,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id73" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id73');"
+                           <div class="floatRight"><input id="button_usedBy_id76" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id76');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id73" style="display:block">
+                           <div id="usedBy_id76" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b></td>
                                  </tr>
                               </table>
@@ -6779,12 +6919,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id73" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id73');"
+                           <div class="floatRight"><input id="button_source_id76" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id76');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id73" style="display:block">
+                           <div id="source_id76" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -6808,7 +6948,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id74"></a><div class="componentTitle">Element <span class="qname">initrd</span></div>
+      </table><a id="id77"></a><div class="componentTitle">Element <span class="qname">initrd</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -6827,13 +6967,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id74" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id77" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id74');"
+                                     onclick="switchState('annotations_id77');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id74" style="display:block">
+                           <div id="annotations_id77" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -6848,12 +6988,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id74" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id74');"
+                           <div class="floatRight"><input id="button_diagram_id77" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id77');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id74" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html278.jpeg" /></div>
+                           <div id="diagram_id77" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html42.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -6863,13 +7003,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id74" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id77" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id74');"
+                                     onclick="switchState('properties_id77');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id74" style="display:block">
+                           <div id="properties_id77" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -6884,16 +7024,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id74" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id74');"
+                           <div class="floatRight"><input id="button_usedBy_id77" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id77');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id74" style="display:block">
+                           <div id="usedBy_id77" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b></td>
                                  </tr>
                               </table>
@@ -6903,12 +7043,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id74" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id74');"
+                           <div class="floatRight"><input id="button_source_id77" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id77');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id74" style="display:block">
+                           <div id="source_id77" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -6932,7 +7072,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id75"></a><div class="componentTitle">Element <span class="qname">partitions</span></div>
+      </table><a id="id78"></a><div class="componentTitle">Element <span class="qname">partitions</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -6951,13 +7091,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id75" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id78" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id75');"
+                                     onclick="switchState('annotations_id78');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id75" style="display:block">
+                           <div id="annotations_id78" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -6972,26 +7112,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id75" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id75');"
+                           <div class="floatRight"><input id="button_diagram_id78" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id78');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id75" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html17.jpeg" usemap="#kiwi_46_html17" /><map name="kiwi_46_html17" id="kiwi_46_html17">
-                                 <area alt="kiwi0.tmp#id85" href="kiwi0.html#id85" coords="128,43,277,69" />
-                                 <area alt="kiwi0.tmp#id76" href="kiwi0.html#id76" coords="203,95,280,119" /></map></div>
+                           <div id="diagram_id78" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html85.jpeg" usemap="#kiwi_46_html85" /><map name="kiwi_46_html85" id="kiwi_46_html85">
+                                 <area alt="kiwi0.tmp#id88" href="kiwi0.html#id88" coords="128,43,277,69" />
+                                 <area alt="kiwi0.tmp#id79" href="kiwi0.html#id79" coords="203,95,280,119" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id75" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id78" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id75');"
+                                     onclick="switchState('properties_id78');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id75" style="display:block">
+                           <div id="properties_id78" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -7006,16 +7146,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id75" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id75');"
+                           <div class="floatRight"><input id="button_usedBy_id78" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id78');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id75" style="display:block">
+                           <div id="usedBy_id78" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b></td>
                                  </tr>
                               </table>
@@ -7024,23 +7164,23 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id76" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id79" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partition+</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id76" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id79" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partition</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id75" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id75');"
+                           <div class="floatRight"><input id="button_instance_id78" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id78');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id75" style="display:block">
+                           <div id="instance_id78" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -7055,13 +7195,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id75" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id78" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id75');"
+                                     onclick="switchState('attributes_id78');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id75" style="display:block">
+                           <div id="attributes_id78" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -7074,7 +7214,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id86" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id89" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">device</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -7091,12 +7231,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id75" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id75');"
+                           <div class="floatRight"><input id="button_source_id78" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id78');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id75" style="display:block">
+                           <div id="source_id78" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -7126,7 +7266,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id76"></a><div class="componentTitle">Element <span class="qname">partition</span></div>
+      </table><a id="id79"></a><div class="componentTitle">Element <span class="qname">partition</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -7145,13 +7285,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id76" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id79" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id76');"
+                                     onclick="switchState('annotations_id79');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id76" style="display:block">
+                           <div id="annotations_id79" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -7166,26 +7306,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id76" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id76');"
+                           <div class="floatRight"><input id="button_diagram_id79" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id79');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id76" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html192.jpeg"
-                                   usemap="#kiwi_46_html192" /><map name="kiwi_46_html192" id="kiwi_46_html192">
-                                 <area alt="kiwi0.tmp#id77" href="kiwi0.html#id77" coords="122,43,265,69" /></map></div>
+                           <div id="diagram_id79" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html8.jpeg" usemap="#kiwi_46_html8" /><map name="kiwi_46_html8" id="kiwi_46_html8">
+                                 <area alt="kiwi0.tmp#id80" href="kiwi0.html#id80" coords="122,43,265,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id76" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id79" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id76');"
+                                     onclick="switchState('properties_id79');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id76" style="display:block">
+                           <div id="properties_id79" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -7200,16 +7339,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id76" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id76');"
+                           <div class="floatRight"><input id="button_usedBy_id79" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id79');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id76" style="display:block">
+                           <div id="usedBy_id79" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id75" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id78" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partitions</a></b></td>
                                  </tr>
                               </table>
@@ -7219,13 +7358,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id76" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id79" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id76');"
+                                     onclick="switchState('attributes_id79');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id76" style="display:block">
+                           <div id="attributes_id79" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -7238,7 +7377,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id83" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id86" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mountpoint</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -7256,7 +7395,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id81" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id84" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">number</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -7274,7 +7413,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id82" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id85" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b></td>
                                     <td><b><a href="kiwi0.html#id2" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size-type</a></b></td>
@@ -7293,7 +7432,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id84" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id87" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">target</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -7304,7 +7443,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id79" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id82" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -7328,12 +7467,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id76" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id76');"
+                           <div class="floatRight"><input id="button_source_id79" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id79');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id76" style="display:block">
+                           <div id="source_id79" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -7360,7 +7499,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id87"></a><div class="componentTitle">Element <span class="qname">union</span></div>
+      </table><a id="id90"></a><div class="componentTitle">Element <span class="qname">union</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -7379,13 +7518,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id87" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id90" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id87');"
+                                     onclick="switchState('annotations_id90');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id87" style="display:block">
+                           <div id="annotations_id90" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -7400,25 +7539,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id87" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id87');"
+                           <div class="floatRight"><input id="button_diagram_id90" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id90');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id87" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html99.jpeg" usemap="#kiwi_46_html99" /><map name="kiwi_46_html99" id="kiwi_46_html99">
-                                 <area alt="kiwi0.tmp#id88" href="kiwi0.html#id88" coords="107,43,235,69" /></map></div>
+                           <div id="diagram_id90" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html138.jpeg"
+                                   usemap="#kiwi_46_html138" /><map name="kiwi_46_html138" id="kiwi_46_html138">
+                                 <area alt="kiwi0.tmp#id91" href="kiwi0.html#id91" coords="107,43,235,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id87" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id90" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id87');"
+                                     onclick="switchState('properties_id90');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id87" style="display:block">
+                           <div id="properties_id90" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -7433,16 +7573,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id87" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id87');"
+                           <div class="floatRight"><input id="button_usedBy_id90" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id90');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id87" style="display:block">
+                           <div id="usedBy_id90" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b></td>
                                  </tr>
                               </table>
@@ -7452,13 +7592,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id87" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id90" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id87');"
+                                     onclick="switchState('attributes_id90');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id87" style="display:block">
+                           <div id="attributes_id90" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -7471,7 +7611,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id90" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id93" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ro</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -7489,7 +7629,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id92" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id95" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rw</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -7507,7 +7647,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id94" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id97" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -7524,12 +7664,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id87" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id87');"
+                           <div class="floatRight"><input id="button_source_id90" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id90');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id87" style="display:block">
+                           <div id="source_id90" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -7556,7 +7696,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id95"></a><div class="componentTitle">Element <span class="qname">configuration</span></div>
+      </table><a id="id98"></a><div class="componentTitle">Element <span class="qname">configuration</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -7575,13 +7715,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id95" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id98" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id95');"
+                                     onclick="switchState('annotations_id98');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id95" style="display:block">
+                           <div id="annotations_id98" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -7596,26 +7736,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id95" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id95');"
+                           <div class="floatRight"><input id="button_diagram_id98" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id98');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id95" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html270.jpeg"
-                                   usemap="#kiwi_46_html270" /><map name="kiwi_46_html270" id="kiwi_46_html270">
-                                 <area alt="kiwi0.tmp#id96" href="kiwi0.html#id96" coords="149,43,319,69" /></map></div>
+                           <div id="diagram_id98" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html181.jpeg"
+                                   usemap="#kiwi_46_html181" /><map name="kiwi_46_html181" id="kiwi_46_html181">
+                                 <area alt="kiwi0.tmp#id99" href="kiwi0.html#id99" coords="149,43,319,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id95" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id98" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id95');"
+                                     onclick="switchState('properties_id98');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id95" style="display:block">
+                           <div id="properties_id98" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -7630,16 +7770,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id95" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id95');"
+                           <div class="floatRight"><input id="button_usedBy_id98" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id98');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id95" style="display:block">
+                           <div id="usedBy_id98" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b></td>
                                  </tr>
                               </table>
@@ -7649,13 +7789,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id95" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id98" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id95');"
+                                     onclick="switchState('attributes_id98');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id95" style="display:block">
+                           <div id="attributes_id98" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -7668,7 +7808,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id103" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id106" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -7686,7 +7826,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id102" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id105" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">dest</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -7704,7 +7844,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id99" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id102" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -7721,12 +7861,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id95" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id95');"
+                           <div class="floatRight"><input id="button_source_id98" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id98');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id95" style="display:block">
+                           <div id="source_id98" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -7753,7 +7893,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id107"></a><div class="componentTitle">Element <span class="qname">size</span></div>
+      </table><a id="id110"></a><div class="componentTitle">Element <span class="qname">size</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -7772,13 +7912,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id107" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id107');"
+                           <div class="floatRight"><input id="button_diagram_id110" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id110');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id107" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html48.jpeg" usemap="#kiwi_46_html48" /><map name="kiwi_46_html48" id="kiwi_46_html48">
-                                 <area alt="kiwi0.tmp#id108" href="kiwi0.html#id108" coords="307,79,425,105" /></map></div>
+                           <div id="diagram_id110" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html55.jpeg" usemap="#kiwi_46_html55" /><map name="kiwi_46_html55" id="kiwi_46_html55">
+                                 <area alt="kiwi0.tmp#id111" href="kiwi0.html#id111" coords="307,79,425,105" /></map></div>
                         </td>
                      </tr>
                      <tr>
@@ -7788,13 +7928,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id107" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id110" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id107');"
+                                     onclick="switchState('properties_id110');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id107" style="display:block">
+                           <div id="properties_id110" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -7809,16 +7949,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id107" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id107');"
+                           <div class="floatRight"><input id="button_usedBy_id110" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id110');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id107" style="display:block">
+                           <div id="usedBy_id110" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                  </tr>
                               </table>
@@ -7828,13 +7968,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id107" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id110" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id107');"
+                                     onclick="switchState('attributes_id110');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id107" style="display:block">
+                           <div id="attributes_id110" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -7847,7 +7987,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id110" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id113" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">additive</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -7858,7 +7998,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id109" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id112" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">unit</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -7882,12 +8022,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id107" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id107');"
+                           <div class="floatRight"><input id="button_source_id110" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id110');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id107" style="display:block">
+                           <div id="source_id110" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -7915,7 +8055,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id111"></a><div class="componentTitle">Element <span class="qname">split</span></div>
+      </table><a id="id114"></a><div class="componentTitle">Element <span class="qname">split</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -7934,13 +8074,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id111" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id114" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id111');"
+                                     onclick="switchState('annotations_id114');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id111" style="display:block">
+                           <div id="annotations_id114" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -7955,26 +8095,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id111" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id111');"
+                           <div class="floatRight"><input id="button_diagram_id114" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id114');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id111" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html94.jpeg" usemap="#kiwi_46_html94" /><map name="kiwi_46_html94" id="kiwi_46_html94">
-                                 <area alt="kiwi0.tmp#id112" href="kiwi0.html#id112" coords="175,2,262,26" />
-                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="175,36,260,60" /></map></div>
+                           <div id="diagram_id114" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html255.jpeg"
+                                   usemap="#kiwi_46_html255" /><map name="kiwi_46_html255" id="kiwi_46_html255">
+                                 <area alt="kiwi0.tmp#id115" href="kiwi0.html#id115" coords="175,2,262,26" />
+                                 <area alt="kiwi0.tmp#id125" href="kiwi0.html#id125" coords="175,36,260,60" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id111" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id114" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id111');"
+                                     onclick="switchState('properties_id114');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id111" style="display:block">
+                           <div id="properties_id114" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -7989,16 +8130,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id111" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id111');"
+                           <div class="floatRight"><input id="button_usedBy_id114" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id114');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id111" style="display:block">
+                           <div id="usedBy_id114" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                  </tr>
                               </table>
@@ -8007,25 +8148,25 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id112" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">temporary</a></b> | <b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id115" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">temporary</a></b> | <b><a href="kiwi0.html#id125" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">persistent</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">persistent</a></b>, <b><a href="kiwi0.html#id112" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id125" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">persistent</a></b>, <b><a href="kiwi0.html#id115" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">temporary</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id111" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id111');"
+                           <div class="floatRight"><input id="button_instance_id114" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id114');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id111" style="display:block">
+                           <div id="instance_id114" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -8041,12 +8182,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id111" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id111');"
+                           <div class="floatRight"><input id="button_source_id114" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id114');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id111" style="display:block">
+                           <div id="source_id114" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -8076,7 +8217,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id112"></a><div class="componentTitle">Element <span class="qname">temporary</span></div>
+      </table><a id="id115"></a><div class="componentTitle">Element <span class="qname">temporary</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -8095,13 +8236,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id112" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id115" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id112');"
+                                     onclick="switchState('annotations_id115');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id112" style="display:block">
+                           <div id="annotations_id115" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -8116,26 +8257,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id112" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id112');"
+                           <div class="floatRight"><input id="button_diagram_id115" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id115');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id112" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html82.jpeg" usemap="#kiwi_46_html82" /><map name="kiwi_46_html82" id="kiwi_46_html82">
-                                 <area alt="kiwi0.tmp#id113" href="kiwi0.html#id113" coords="207,2,274,26" />
-                                 <area alt="kiwi0.tmp#id116" href="kiwi0.html#id116" coords="207,36,262,60" /></map></div>
+                           <div id="diagram_id115" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html58.jpeg" usemap="#kiwi_46_html58" /><map name="kiwi_46_html58" id="kiwi_46_html58">
+                                 <area alt="kiwi0.tmp#id116" href="kiwi0.html#id116" coords="207,2,274,26" />
+                                 <area alt="kiwi0.tmp#id121" href="kiwi0.html#id121" coords="207,36,262,60" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id112" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id115" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id112');"
+                                     onclick="switchState('properties_id115');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id112" style="display:block">
+                           <div id="properties_id115" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -8150,16 +8291,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id112" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id112');"
+                           <div class="floatRight"><input id="button_usedBy_id115" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id115');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id112" style="display:block">
+                           <div id="usedBy_id115" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id114" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">split</a></b></td>
                                  </tr>
                               </table>
@@ -8168,25 +8309,25 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id113" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b> | <b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b> | <b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">file</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id113" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b>, <b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b>, <b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">file</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id112" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id112');"
+                           <div class="floatRight"><input id="button_instance_id115" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id115');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id112" style="display:block">
+                           <div id="instance_id115" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -8202,12 +8343,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id112" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id112');"
+                           <div class="floatRight"><input id="button_source_id115" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id115');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id112" style="display:block">
+                           <div id="source_id115" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -8237,7 +8378,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id113"></a><div class="componentTitle">Element <span class="qname">except</span></div>
+      </table><a id="id116"></a><div class="componentTitle">Element <span class="qname">except</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -8256,13 +8397,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id113" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id116" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id113');"
+                                     onclick="switchState('annotations_id116');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id113" style="display:block">
+                           <div id="annotations_id116" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -8277,26 +8418,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id113" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id113');"
+                           <div class="floatRight"><input id="button_diagram_id116" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id116');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id113" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html109.jpeg"
-                                   usemap="#kiwi_46_html109" /><map name="kiwi_46_html109" id="kiwi_46_html109">
-                                 <area alt="kiwi0.tmp#id114" href="kiwi0.html#id114" coords="112,43,245,69" /></map></div>
+                           <div id="diagram_id116" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html216.jpeg"
+                                   usemap="#kiwi_46_html216" /><map name="kiwi_46_html216" id="kiwi_46_html216">
+                                 <area alt="kiwi0.tmp#id117" href="kiwi0.html#id117" coords="112,43,245,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id113" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id116" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id113');"
+                                     onclick="switchState('properties_id116');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id113" style="display:block">
+                           <div id="properties_id116" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -8311,17 +8452,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id113" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id113');"
+                           <div class="floatRight"><input id="button_usedBy_id116" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id116');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id113" style="display:block">
+                           <div id="usedBy_id116" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Elements </td>
-                                    <td><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">persistent</a></b>, <b><a href="kiwi0.html#id112" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id125" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">persistent</a></b>, <b><a href="kiwi0.html#id115" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">temporary</a></b></td>
                                  </tr>
                               </table>
@@ -8331,13 +8472,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id113" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id116" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id113');"
+                                     onclick="switchState('attributes_id116');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id113" style="display:block">
+                           <div id="attributes_id116" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -8350,7 +8491,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -8374,12 +8515,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id113" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id113');"
+                           <div class="floatRight"><input id="button_source_id116" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id116');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id113" style="display:block">
+                           <div id="source_id116" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -8406,7 +8547,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id116"></a><div class="componentTitle">Element <span class="qname">file</span></div>
+      </table><a id="id121"></a><div class="componentTitle">Element <span class="qname">file</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -8425,13 +8566,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id116" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id121" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id116');"
+                                     onclick="switchState('annotations_id121');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id116" style="display:block">
+                           <div id="annotations_id121" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -8446,26 +8587,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id116" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id116');"
+                           <div class="floatRight"><input id="button_diagram_id121" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id121');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id116" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html276.jpeg"
-                                   usemap="#kiwi_46_html276" /><map name="kiwi_46_html276" id="kiwi_46_html276">
-                                 <area alt="kiwi0.tmp#id117" href="kiwi0.html#id117" coords="100,43,213,69" /></map></div>
+                           <div id="diagram_id121" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html219.jpeg"
+                                   usemap="#kiwi_46_html219" /><map name="kiwi_46_html219" id="kiwi_46_html219">
+                                 <area alt="kiwi0.tmp#id122" href="kiwi0.html#id122" coords="100,43,213,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id116" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id121" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id116');"
+                                     onclick="switchState('properties_id121');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id116" style="display:block">
+                           <div id="properties_id121" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -8480,18 +8621,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id116" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id116');"
+                           <div class="floatRight"><input id="button_usedBy_id121" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id121');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id116" style="display:block">
+                           <div id="usedBy_id121" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Elements </td>
-                                    <td><b><a href="kiwi0.html#id288" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">drivers</a></b>, <b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">persistent</a></b>, <b><a href="kiwi0.html#id112" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id281" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">drivers</a></b>, <b><a href="kiwi0.html#id125" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">persistent</a></b>, <b><a href="kiwi0.html#id115" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">temporary</a></b></td>
                                  </tr>
                               </table>
@@ -8501,13 +8642,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id116" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id121" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id116');"
+                                     onclick="switchState('attributes_id121');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id116" style="display:block">
+                           <div id="attributes_id121" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -8520,7 +8661,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id119" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id124" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -8538,7 +8679,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -8562,12 +8703,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id116" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id116');"
+                           <div class="floatRight"><input id="button_source_id121" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id121');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id116" style="display:block">
+                           <div id="source_id121" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -8594,7 +8735,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id120"></a><div class="componentTitle">Element <span class="qname">persistent</span></div>
+      </table><a id="id125"></a><div class="componentTitle">Element <span class="qname">persistent</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -8613,13 +8754,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id120" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id125" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id120');"
+                                     onclick="switchState('annotations_id125');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id120" style="display:block">
+                           <div id="annotations_id125" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -8634,27 +8775,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id120" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id120');"
+                           <div class="floatRight"><input id="button_diagram_id125" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id125');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id120" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html150.jpeg"
-                                   usemap="#kiwi_46_html150" /><map name="kiwi_46_html150" id="kiwi_46_html150">
-                                 <area alt="kiwi0.tmp#id113" href="kiwi0.html#id113" coords="205,2,272,26" />
-                                 <area alt="kiwi0.tmp#id116" href="kiwi0.html#id116" coords="205,36,260,60" /></map></div>
+                           <div id="diagram_id125" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html211.jpeg"
+                                   usemap="#kiwi_46_html211" /><map name="kiwi_46_html211" id="kiwi_46_html211">
+                                 <area alt="kiwi0.tmp#id116" href="kiwi0.html#id116" coords="205,2,272,26" />
+                                 <area alt="kiwi0.tmp#id121" href="kiwi0.html#id121" coords="205,36,260,60" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id120" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id125" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id120');"
+                                     onclick="switchState('properties_id125');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id120" style="display:block">
+                           <div id="properties_id125" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -8669,16 +8810,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id120" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id120');"
+                           <div class="floatRight"><input id="button_usedBy_id125" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id125');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id120" style="display:block">
+                           <div id="usedBy_id125" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id114" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">split</a></b></td>
                                  </tr>
                               </table>
@@ -8687,25 +8828,25 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id113" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b> | <b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b> | <b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">file</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id113" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b>, <b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b>, <b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">file</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id120" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id120');"
+                           <div class="floatRight"><input id="button_instance_id125" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id125');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id120" style="display:block">
+                           <div id="instance_id125" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -8721,12 +8862,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id120" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id120');"
+                           <div class="floatRight"><input id="button_source_id125" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id125');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id120" style="display:block">
+                           <div id="source_id125" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -8756,7 +8897,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id121"></a><div class="componentTitle">Element <span class="qname">vmwareconfig</span></div>
+      </table><a id="id126"></a><div class="componentTitle">Element <span class="qname">machine</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -8775,18 +8916,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id121" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id126" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id121');"
+                                     onclick="switchState('annotations_id126');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id121" style="display:block">
+                           <div id="annotations_id126" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">specifies the VMware configuration sections</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">specifies the VM configuration sections</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -8796,28 +8937,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id121" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id121');"
+                           <div class="floatRight"><input id="button_diagram_id126" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id126');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id121" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html87.jpeg" usemap="#kiwi_46_html87" /><map name="kiwi_46_html87" id="kiwi_46_html87">
-                                 <area alt="kiwi0.tmp#id142" href="kiwi0.html#id142" coords="172,43,344,69" />
-                                 <area alt="kiwi0.tmp#id122" href="kiwi0.html#id122" coords="226,91,314,115" />
-                                 <area alt="kiwi0.tmp#id130" href="kiwi0.html#id130" coords="226,125,320,149" />
-                                 <area alt="kiwi0.tmp#id136" href="kiwi0.html#id136" coords="226,159,333,183" /></map></div>
+                           <div id="diagram_id126" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html118.jpeg"
+                                   usemap="#kiwi_46_html118" /><map name="kiwi_46_html118" id="kiwi_46_html118">
+                                 <area alt="kiwi0.tmp#id147" href="kiwi0.html#id147" coords="142,43,284,69" />
+                                 <area alt="kiwi0.tmp#id127" href="kiwi0.html#id127" coords="196,91,259,115" />
+                                 <area alt="kiwi0.tmp#id134" href="kiwi0.html#id134" coords="196,125,265,149" />
+                                 <area alt="kiwi0.tmp#id141" href="kiwi0.html#id141" coords="196,159,263,183" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id121" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id126" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id121');"
+                                     onclick="switchState('properties_id126');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id121" style="display:block">
+                           <div id="properties_id126" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -8832,16 +8974,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id121" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id121');"
+                           <div class="floatRight"><input id="button_usedBy_id126" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id126');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id121" style="display:block">
+                           <div id="usedBy_id126" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                  </tr>
                               </table>
@@ -8850,35 +8992,35 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id122" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwarenic</a></b> | <b><a href="kiwi0.html#id130" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwaredisk</a></b> | <b><a href="kiwi0.html#id136" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwarecdrom</a></b></td>
+                        <td><b><a href="kiwi0.html#id127" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmnic</a></b> | <b><a href="kiwi0.html#id134" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmdisk</a></b> | <b><a href="kiwi0.html#id141" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmdvd</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id136" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwarecdrom</a></b>, <b><a href="kiwi0.html#id130" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwaredisk</a></b>, <b><a href="kiwi0.html#id122" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwarenic</a></b></td>
+                        <td><b><a href="kiwi0.html#id134" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmdisk</a></b>, <b><a href="kiwi0.html#id141" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmdvd</a></b>, <b><a href="kiwi0.html#id127" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmnic</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id121" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id121');"
+                           <div class="floatRight"><input id="button_instance_id126" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id126');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id121" style="display:block">
+                           <div id="instance_id126" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><vmwareconfig</span><span class="tokenText"> </span><span class="tokenAttrName">arch=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">guestOS=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">HWversion=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">memory=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">usb=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><vmwarenic</span><span class="tokenText"> </span><span class="tokenAttrName">driver=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">interface=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">mode=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></vmwarenic></span><span class="tokenIndent">
-  </span><span class="tokenElement"><vmwaredisk</span><span class="tokenText"> </span><span class="tokenAttrName">controller=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">id=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></vmwaredisk></span><span class="tokenIndent">
-  </span><span class="tokenElement"><vmwarecdrom</span><span class="tokenText"> </span><span class="tokenAttrName">controller=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">id=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></vmwarecdrom></span><span class="tokenIndent">
-</span><span class="tokenElement"></vmwareconfig></span></pre></td>
+                                    <td width="100%"><pre><span class="tokenElement"><machine</span><span class="tokenText"> </span><span class="tokenAttrName">arch=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">domain=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">guestOS=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">HWversion=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">memory=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><vmnic</span><span class="tokenText"> </span><span class="tokenAttrName">driver=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">interface=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">mac=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">mode=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></vmnic></span><span class="tokenIndent">
+  </span><span class="tokenElement"><vmdisk</span><span class="tokenText"> </span><span class="tokenAttrName">controller=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">device=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">id=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></vmdisk></span><span class="tokenIndent">
+  </span><span class="tokenElement"><vmdvd</span><span class="tokenText"> </span><span class="tokenAttrName">controller=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">id=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></vmdvd></span><span class="tokenIndent">
+</span><span class="tokenElement"></machine></span></pre></td>
                                  </tr>
                               </table>
                            </div>
@@ -8887,13 +9029,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id121" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id126" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id121');"
+                                     onclick="switchState('attributes_id126');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id121" style="display:block">
+                           <div id="attributes_id126" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -8906,7 +9048,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id144" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id149" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">HWversion</a></b></td>
                                     <td><b>xs:integer</b></td>
                                     <td></td>
@@ -8917,14 +9059,14 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The virtual HW version number for the VMware configuration</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The virtual HW version number for the VM configuration</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id143" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id148" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -8935,16 +9077,16 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">the VMware architecture type</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">the VM architecture type</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id145" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">guestOS</a></b></td>
-                                    <td></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id152" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">domain</a></b></td>
+                                    <td>restriction of <b>xs:token</b></td>
                                     <td></td>
                                     <td></td>
                                     <td>optional</td>
@@ -8953,34 +9095,34 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">the virtual guestOS identification string for VMware</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The domain setup for the VM (xen only)</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id148" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">memory</a></b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id150" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">guestOS</a></b></td>
                                     <td></td>
                                     <td></td>
                                     <td></td>
-                                    <td>required</td>
+                                    <td>optional</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The memory setup for the guest VM.</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">the virtual guestOS identification string for the VM</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id146" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">usb</a></b></td>
-                                    <td><b>xs:boolean</b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id151" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">memory</a></b></td>
+                                    <td></td>
                                     <td></td>
                                     <td></td>
                                     <td>optional</td>
@@ -8989,7 +9131,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">Activate/Deactivate usb controller for VMware</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The memory setup for the guest VM.</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -9002,26 +9144,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id121" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id121');"
+                           <div class="floatRight"><input id="button_source_id126" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id126');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id121" style="display:block">
+                           <div id="source_id126" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"vmwareconfig"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"machine"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">specifies the VMware configuration sections</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">specifies the VM configuration sections</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:complexType</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:choice</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"vmwarenic"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"vmwaredisk"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"vmwarecdrom"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"vmnic"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"vmdisk"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"vmdvd"</span><span class="tokenElement">/></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:choice></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmwareconfig.attlist"</span><span class="tokenElement">/></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.machine.attlist"</span><span class="tokenElement">/></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:complexType></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:element></span></pre></td>
                                  </tr>
@@ -9039,7 +9181,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id122"></a><div class="componentTitle">Element <span class="qname">vmwarenic</span></div>
+      </table><a id="id127"></a><div class="componentTitle">Element <span class="qname">vmnic</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -9058,18 +9200,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id122" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id127" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id122');"
+                                     onclick="switchState('annotations_id127');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id122" style="display:block">
+                           <div id="annotations_id127" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The VMware network interface definition</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The VM network interface definition</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -9079,26 +9221,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id122" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id122');"
+                           <div class="floatRight"><input id="button_diagram_id127" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id127');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id122" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html116.jpeg"
-                                   usemap="#kiwi_46_html116" /><map name="kiwi_46_html116" id="kiwi_46_html116">
-                                 <area alt="kiwi0.tmp#id123" href="kiwi0.html#id123" coords="133,43,287,69" /></map></div>
+                           <div id="diagram_id127" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html84.jpeg" usemap="#kiwi_46_html84" /><map name="kiwi_46_html84" id="kiwi_46_html84">
+                                 <area alt="kiwi0.tmp#id128" href="kiwi0.html#id128" coords="108,43,237,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id122" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id127" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id122');"
+                                     onclick="switchState('properties_id127');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id122" style="display:block">
+                           <div id="properties_id127" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -9113,17 +9254,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id122" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id122');"
+                           <div class="floatRight"><input id="button_usedBy_id127" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id127');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id122" style="display:block">
+                           <div id="usedBy_id127" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwareconfig</a></b></td>
+                                    <td><b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">machine</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -9132,13 +9273,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id122" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id127" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id122');"
+                                     onclick="switchState('attributes_id127');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id122" style="display:block">
+                           <div id="attributes_id127" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -9151,12 +9292,12 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id125" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id129" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">driver</a></b></td>
                                     <td></td>
                                     <td></td>
                                     <td></td>
-                                    <td>required</td>
+                                    <td>optional</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
@@ -9169,9 +9310,9 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id127" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id131" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">interface</a></b></td>
-                                    <td><b>xs:nonNegativeInteger</b></td>
+                                    <td></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -9187,345 +9328,36 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id129" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mode</a></b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation">
-                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                                 class="preWrapContainer">
-                                             <tr>
-                                                <td width="100%"><pre><span class="tokenText">The VM network mode</span></pre></td>
-                                             </tr>
-                                          </table>
-                                       </div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id122" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id122');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id122" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"vmwarenic"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VMware network interface definition</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:complexType</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmwarenic.attlist"</span><span class="tokenElement">/></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:complexType></span><span class="tokenIndent">
-</span><span class="tokenElement"></xs:element></span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id130"></a><div class="componentTitle">Element <span class="qname">vmwaredisk</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id130" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id130');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id130" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html280.jpeg"
-                                   usemap="#kiwi_46_html280" /><map name="kiwi_46_html280" id="kiwi_46_html280">
-                                 <area alt="kiwi0.tmp#id131" href="kiwi0.html#id131" coords="139,43,299,69" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id130" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id130');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id130" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id130" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id130');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id130" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwareconfig</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id130" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id130');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id130" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
                                     <td class="firstColumn"><b><a href="kiwi0.html#id133" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">controller</a></b></td>
-                                    <td>restriction of <b>xs:token</b></td>
-                                    <td></td>
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mac</a></b></td>
                                     <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation">
-                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                                 class="preWrapContainer">
-                                             <tr>
-                                                <td width="100%"><pre><span class="tokenText">The disk controller used for the VMware guest</span></pre></td>
-                                             </tr>
-                                          </table>
-                                       </div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id135" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
-                                    <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
                                     <td></td>
-                                    <td>required</td>
+                                    <td>optional</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The disk ID for the VM disk</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The VM mac address</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id130" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id130');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id130" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"vmwaredisk"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:complexType</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmwaredisk.attlist"</span><span class="tokenElement">/></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:complexType></span><span class="tokenIndent">
-</span><span class="tokenElement"></xs:element></span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id136"></a><div class="componentTitle">Element <span class="qname">vmwarecdrom</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id136" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id136');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id136" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html233.jpeg"
-                                   usemap="#kiwi_46_html233" /><map name="kiwi_46_html233" id="kiwi_46_html233">
-                                 <area alt="kiwi0.tmp#id137" href="kiwi0.html#id137" coords="152,43,325,69" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id136" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id136');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id136" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id136" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id136');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id136" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwareconfig</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id136" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id136');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id136" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id139" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">controller</a></b></td>
-                                    <td>restriction of <b>xs:token</b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id132" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mode</a></b></td>
                                     <td></td>
                                     <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation">
-                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                                 class="preWrapContainer">
-                                             <tr>
-                                                <td width="100%"><pre><span class="tokenText">The CD/DVD controller used for the VMware guest</span></pre></td>
-                                             </tr>
-                                          </table>
-                                       </div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id141" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
-                                    <td><b>xs:nonNegativeInteger</b></td>
-                                    <td></td>
                                     <td></td>
-                                    <td>required</td>
+                                    <td>optional</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The CD/DVD ID for the VM CD rom drive</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The VM network mode</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -9538,18 +9370,21 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id136" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id136');"
+                           <div class="floatRight"><input id="button_source_id127" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id127');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id136" style="display:block">
+                           <div id="source_id127" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"vmwarecdrom"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"vmnic"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VM network interface definition</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:complexType</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmwarecdrom.attlist"</span><span class="tokenElement">/></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmnic.attlist"</span><span class="tokenElement">/></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:complexType></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:element></span></pre></td>
                                  </tr>
@@ -9567,7 +9402,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id149"></a><div class="componentTitle">Element <span class="qname">xenconfig</span></div>
+      </table><a id="id134"></a><div class="componentTitle">Element <span class="qname">vmdisk</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -9586,18 +9421,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id149" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id134" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id149');"
+                                     onclick="switchState('annotations_id134');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id149" style="display:block">
+                           <div id="annotations_id134" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">specifies the Xen configuration sections</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The VM disk definition.</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -9607,27 +9442,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id149" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id149');"
+                           <div class="floatRight"><input id="button_diagram_id134" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id134');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id149" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html1.jpeg" usemap="#kiwi_46_html1" /><map name="kiwi_46_html1" id="kiwi_46_html1">
-                                 <area alt="kiwi0.tmp#id159" href="kiwi0.html#id159" coords="151,43,302,69" />
-                                 <area alt="kiwi0.tmp#id150" href="kiwi0.html#id150" coords="205,91,278,115" />
-                                 <area alt="kiwi0.tmp#id154" href="kiwi0.html#id154" coords="205,125,291,149" /></map></div>
+                           <div id="diagram_id134" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html2.jpeg" usemap="#kiwi_46_html2" /><map name="kiwi_46_html2" id="kiwi_46_html2">
+                                 <area alt="kiwi0.tmp#id135" href="kiwi0.html#id135" coords="114,43,249,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id149" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id134" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id149');"
+                                     onclick="switchState('properties_id134');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id149" style="display:block">
+                           <div id="properties_id134" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -9642,50 +9475,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id149" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id149');"
+                           <div class="floatRight"><input id="button_usedBy_id134" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id134');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id149" style="display:block">
+                           <div id="usedBy_id134" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id150" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xendisk</a></b> | <b><a href="kiwi0.html#id154" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenbridge</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id154" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenbridge</a></b>, <b><a href="kiwi0.html#id150" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xendisk</a></b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id149" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id149');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="instance_id149" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xenconfig</span><span class="tokenText"> </span><span class="tokenAttrName">domain=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">memory=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xendisk</span><span class="tokenText"> </span><span class="tokenAttrName">device=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></xendisk></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xenbridge</span><span class="tokenText"> </span><span class="tokenAttrName">mac=</span><span class="tokenAttrValue">""</span><span class="tokenText"> </span><span class="tokenAttrName">name=</span><span class="tokenAttrValue">""</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">{1,1}</span><span class="tokenElement"></xenbridge></span><span class="tokenIndent">
-</span><span class="tokenElement"></xenconfig></span></pre></td>
+                                    <td><b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">machine</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -9694,13 +9494,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id149" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id134" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id149');"
+                                     onclick="switchState('attributes_id134');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id149" style="display:block">
+                           <div id="attributes_id134" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -9713,26 +9513,26 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id161" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">domain</a></b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id137" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">controller</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
                                     <td></td>
-                                    <td>optional</td>
+                                    <td>required</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The type of Xen domain to create (dom0 or domU)</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The disk controller used for the VM guest</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id160" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">memory</a></b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id140" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">device</a></b></td>
                                     <td></td>
                                     <td></td>
                                     <td></td>
@@ -9742,170 +9542,16 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The memory setup for the Xen guest.</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The disk device to appear in the guest (xen only)</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id149" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id149');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id149" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"xenconfig"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">specifies the Xen configuration sections</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:complexType</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:choice</span><span class="tokenAttrName"> minOccurs=</span><span class="tokenAttrValue">"0"</span><span class="tokenAttrName"> maxOccurs=</span><span class="tokenAttrValue">"unbounded"</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"xendisk"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"xenbridge"</span><span class="tokenElement">/></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:choice></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.xenconfig.attlist"</span><span class="tokenElement">/></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:complexType></span><span class="tokenIndent">
-</span><span class="tokenElement"></xs:element></span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id150"></a><div class="componentTitle">Element <span class="qname">xendisk</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id150" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('annotations_id150');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="annotations_id150" style="display:block">
-                              <div class="annotation">
-                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                        class="preWrapContainer">
-                                    <tr>
-                                       <td width="100%"><pre><span class="tokenText">The Xen disk device definition.</span></pre></td>
-                                    </tr>
-                                 </table>
-                              </div>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id150" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id150');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id150" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html119.jpeg"
-                                   usemap="#kiwi_46_html119" /><map name="kiwi_46_html119" id="kiwi_46_html119">
-                                 <area alt="kiwi0.tmp#id151" href="kiwi0.html#id151" coords="118,43,257,69" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id150" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id150');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id150" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>complex</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id150" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id150');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id150" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id149" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenconfig</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id150" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id150');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id150" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">device</a></b></td>
-                                    <td></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id139" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
+                                    <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -9914,7 +9560,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The disk device to appear in the Xen guest</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The disk ID / device for the VM disk</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -9927,21 +9573,21 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id150" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id150');"
+                           <div class="floatRight"><input id="button_source_id134" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id134');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id150" style="display:block">
+                           <div id="source_id134" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"xendisk"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"vmdisk"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The Xen disk device definition.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VM disk definition.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:complexType</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.xendisk.attlist"</span><span class="tokenElement">/></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmdisk.attlist"</span><span class="tokenElement">/></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:complexType></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:element></span></pre></td>
                                  </tr>
@@ -9959,7 +9605,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id154"></a><div class="componentTitle">Element <span class="qname">xenbridge</span></div>
+      </table><a id="id141"></a><div class="componentTitle">Element <span class="qname">vmdvd</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -9977,48 +9623,27 @@
                      </tr>
                      <tr>
                         <td class="firstColumn">
-                           <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id154" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('annotations_id154');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="annotations_id154" style="display:block">
-                              <div class="annotation">
-                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                        class="preWrapContainer">
-                                    <tr>
-                                       <td width="100%"><pre><span class="tokenText">The VMware network interface definition</span></pre></td>
-                                    </tr>
-                                 </table>
-                              </div>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id154" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id154');"
+                           <div class="floatRight"><input id="button_diagram_id141" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id141');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id154" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html179.jpeg"
-                                   usemap="#kiwi_46_html179" /><map name="kiwi_46_html179" id="kiwi_46_html179">
-                                 <area alt="kiwi0.tmp#id155" href="kiwi0.html#id155" coords="131,43,283,69" /></map></div>
+                           <div id="diagram_id141" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html117.jpeg"
+                                   usemap="#kiwi_46_html117" /><map name="kiwi_46_html117" id="kiwi_46_html117">
+                                 <area alt="kiwi0.tmp#id142" href="kiwi0.html#id142" coords="112,43,245,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id154" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id141" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id154');"
+                                     onclick="switchState('properties_id141');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id154" style="display:block">
+                           <div id="properties_id141" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -10033,17 +9658,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id154" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id154');"
+                           <div class="floatRight"><input id="button_usedBy_id141" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id141');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id154" style="display:block">
+                           <div id="usedBy_id141" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id149" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenconfig</a></b></td>
+                                    <td><b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">machine</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -10052,13 +9677,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id154" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id141" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id154');"
+                                     onclick="switchState('attributes_id141');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id154" style="display:block">
+                           <div id="attributes_id141" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -10071,27 +9696,27 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id156" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mac</a></b></td>
-                                    <td></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id144" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">controller</a></b></td>
+                                    <td>restriction of <b>xs:token</b></td>
                                     <td></td>
                                     <td></td>
-                                    <td>optional</td>
+                                    <td>required</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The Mac address to assign to the virtual interface</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The CD/DVD controller used for the VM guest</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id158" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
-                                    <td></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id146" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
+                                    <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -10100,7 +9725,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The Xen bridged interface name</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The CD/DVD ID for the VM CD rom drive</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -10113,21 +9738,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id154" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id154');"
+                           <div class="floatRight"><input id="button_source_id141" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id141');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id154" style="display:block">
+                           <div id="source_id141" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"xenbridge"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VMware network interface definition</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:element</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"vmdvd"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:complexType</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.xenbridge.attlist"</span><span class="tokenElement">/></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmdvd.attlist"</span><span class="tokenElement">/></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:complexType></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:element></span></pre></td>
                                  </tr>
@@ -10145,7 +9767,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id186"></a><div class="componentTitle">Element <span class="qname">version</span></div>
+      </table><a id="id179"></a><div class="componentTitle">Element <span class="qname">version</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -10164,13 +9786,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id186" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id179" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id186');"
+                                     onclick="switchState('annotations_id179');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id186" style="display:block">
+                           <div id="annotations_id179" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -10185,12 +9807,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id186" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id186');"
+                           <div class="floatRight"><input id="button_diagram_id179" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id179');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id186" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html193.jpeg" /></div>
+                           <div id="diagram_id179" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html53.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -10200,13 +9822,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id186" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id179" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id186');"
+                                     onclick="switchState('properties_id179');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id186" style="display:block">
+                           <div id="properties_id179" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -10221,16 +9843,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id186" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id186');"
+                           <div class="floatRight"><input id="button_usedBy_id179" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id179');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id186" style="display:block">
+                           <div id="usedBy_id179" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -10240,12 +9862,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id186" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id186');"
+                           <div class="floatRight"><input id="button_source_id179" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id179');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id186" style="display:block">
+                           <div id="source_id179" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -10269,7 +9891,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id187"></a><div class="componentTitle">Element <span class="qname">packagemanager</span></div>
+      </table><a id="id180"></a><div class="componentTitle">Element <span class="qname">packagemanager</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -10288,13 +9910,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id187" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id180" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id187');"
+                                     onclick="switchState('annotations_id180');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id187" style="display:block">
+                           <div id="annotations_id180" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -10309,30 +9931,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id187" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id187');"
+                           <div class="floatRight"><input id="button_diagram_id180" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id180');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id187" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html51.jpeg" usemap="#kiwi_46_html51" /><map name="kiwi_46_html51" id="kiwi_46_html51">
-                                 <area alt="kiwi0.tmp#id188" href="kiwi0.html#id188" coords="237,8,436,34" /></map></div>
+                           <div id="diagram_id180" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html178.jpeg"
+                                   usemap="#kiwi_46_html178" /><map name="kiwi_46_html178" id="kiwi_46_html178">
+                                 <area alt="kiwi0.tmp#id181" href="kiwi0.html#id181" coords="237,8,436,34" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b><a href="kiwi0.html#id188" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id181" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packagemanager.content</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id187" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id180" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id187');"
+                                     onclick="switchState('properties_id180');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id187" style="display:block">
+                           <div id="properties_id180" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -10347,12 +9970,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id187" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id187');"
+                           <div class="floatRight"><input id="button_facets_id180" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id180');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id187" style="display:block">
+                           <div id="facets_id180" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -10389,16 +10012,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id187" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id187');"
+                           <div class="floatRight"><input id="button_usedBy_id180" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id180');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id187" style="display:block">
+                           <div id="usedBy_id180" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -10408,12 +10031,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id187" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id187');"
+                           <div class="floatRight"><input id="button_source_id180" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id180');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id187" style="display:block">
+                           <div id="source_id180" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -10437,7 +10060,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id189"></a><div class="componentTitle">Element <span class="qname">rpm-check-signatures</span></div>
+      </table><a id="id182"></a><div class="componentTitle">Element <span class="qname">rpm-check-signatures</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -10456,13 +10079,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id189" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id182" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id189');"
+                                     onclick="switchState('annotations_id182');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id189" style="display:block">
+                           <div id="annotations_id182" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -10477,30 +10100,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id189" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id189');"
+                           <div class="floatRight"><input id="button_diagram_id182" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id182');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id189" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html90.jpeg" usemap="#kiwi_46_html90" /><map name="kiwi_46_html90" id="kiwi_46_html90">
-                                 <area alt="kiwi0.tmp#id190" href="kiwi0.html#id190" coords="268,8,498,34" /></map></div>
+                           <div id="diagram_id182" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html140.jpeg"
+                                   usemap="#kiwi_46_html140" /><map name="kiwi_46_html140" id="kiwi_46_html140">
+                                 <area alt="kiwi0.tmp#id183" href="kiwi0.html#id183" coords="268,8,498,34" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b><a href="kiwi0.html#id190" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id183" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rpm-check-signatures.content</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id189" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id182" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id189');"
+                                     onclick="switchState('properties_id182');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id189" style="display:block">
+                           <div id="properties_id182" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -10515,16 +10139,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id189" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id189');"
+                           <div class="floatRight"><input id="button_usedBy_id182" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id182');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id189" style="display:block">
+                           <div id="usedBy_id182" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -10534,12 +10158,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id189" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id189');"
+                           <div class="floatRight"><input id="button_source_id182" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id182');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id189" style="display:block">
+                           <div id="source_id182" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -10563,7 +10187,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id191"></a><div class="componentTitle">Element <span class="qname">rpm-excludedocs</span></div>
+      </table><a id="id184"></a><div class="componentTitle">Element <span class="qname">rpm-excludedocs</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -10582,13 +10206,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id191" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id184" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id191');"
+                                     onclick="switchState('annotations_id184');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id191" style="display:block">
+                           <div id="annotations_id184" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -10603,31 +10227,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id191" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id191');"
+                           <div class="floatRight"><input id="button_diagram_id184" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id184');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id191" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html113.jpeg"
-                                   usemap="#kiwi_46_html113" /><map name="kiwi_46_html113" id="kiwi_46_html113">
-                                 <area alt="kiwi0.tmp#id192" href="kiwi0.html#id192" coords="242,8,446,34" /></map></div>
+                           <div id="diagram_id184" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html130.jpeg"
+                                   usemap="#kiwi_46_html130" /><map name="kiwi_46_html130" id="kiwi_46_html130">
+                                 <area alt="kiwi0.tmp#id185" href="kiwi0.html#id185" coords="242,8,446,34" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b><a href="kiwi0.html#id192" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id185" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rpm-excludedocs.content</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id191" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id184" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id191');"
+                                     onclick="switchState('properties_id184');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id191" style="display:block">
+                           <div id="properties_id184" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -10642,16 +10266,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id191" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id191');"
+                           <div class="floatRight"><input id="button_usedBy_id184" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id184');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id191" style="display:block">
+                           <div id="usedBy_id184" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -10661,12 +10285,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id191" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id191');"
+                           <div class="floatRight"><input id="button_source_id184" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id184');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id191" style="display:block">
+                           <div id="source_id184" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -10690,7 +10314,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id193"></a><div class="componentTitle">Element <span class="qname">rpm-force</span></div>
+      </table><a id="id186"></a><div class="componentTitle">Element <span class="qname">rpm-force</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -10709,13 +10333,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id193" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id186" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id193');"
+                                     onclick="switchState('annotations_id186');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id193" style="display:block">
+                           <div id="annotations_id186" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -10730,30 +10354,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id193" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id193');"
+                           <div class="floatRight"><input id="button_diagram_id186" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id186');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id193" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html27.jpeg" usemap="#kiwi_46_html27" /><map name="kiwi_46_html27" id="kiwi_46_html27">
-                                 <area alt="kiwi0.tmp#id194" href="kiwi0.html#id194" coords="202,8,366,34" /></map></div>
+                           <div id="diagram_id186" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html206.jpeg"
+                                   usemap="#kiwi_46_html206" /><map name="kiwi_46_html206" id="kiwi_46_html206">
+                                 <area alt="kiwi0.tmp#id187" href="kiwi0.html#id187" coords="202,8,366,34" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b><a href="kiwi0.html#id194" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id187" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rpm-force.content</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id193" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id186" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id193');"
+                                     onclick="switchState('properties_id186');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id193" style="display:block">
+                           <div id="properties_id186" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -10768,16 +10393,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id193" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id193');"
+                           <div class="floatRight"><input id="button_usedBy_id186" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id186');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id193" style="display:block">
+                           <div id="usedBy_id186" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -10787,12 +10412,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id193" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id193');"
+                           <div class="floatRight"><input id="button_source_id186" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id186');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id193" style="display:block">
+                           <div id="source_id186" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -10816,7 +10441,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id195"></a><div class="componentTitle">Element <span class="qname">keytable</span></div>
+      </table><a id="id188"></a><div class="componentTitle">Element <span class="qname">keytable</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -10835,13 +10460,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id195" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id188" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id195');"
+                                     onclick="switchState('annotations_id188');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id195" style="display:block">
+                           <div id="annotations_id188" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -10856,12 +10481,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id195" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id195');"
+                           <div class="floatRight"><input id="button_diagram_id188" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id188');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id195" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html181.jpeg" /></div>
+                           <div id="diagram_id188" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html141.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -10871,13 +10496,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id195" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id188" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id195');"
+                                     onclick="switchState('properties_id188');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id195" style="display:block">
+                           <div id="properties_id188" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -10892,16 +10517,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id195" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id195');"
+                           <div class="floatRight"><input id="button_usedBy_id188" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id188');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id195" style="display:block">
+                           <div id="usedBy_id188" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -10911,12 +10536,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id195" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id195');"
+                           <div class="floatRight"><input id="button_source_id188" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id188');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id195" style="display:block">
+                           <div id="source_id188" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -10940,7 +10565,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id196"></a><div class="componentTitle">Element <span class="qname">timezone</span></div>
+      </table><a id="id189"></a><div class="componentTitle">Element <span class="qname">timezone</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -10959,13 +10584,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id196" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id189" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id196');"
+                                     onclick="switchState('annotations_id189');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id196" style="display:block">
+                           <div id="annotations_id189" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -10980,12 +10605,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id196" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id196');"
+                           <div class="floatRight"><input id="button_diagram_id189" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id189');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id196" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html182.jpeg" /></div>
+                           <div id="diagram_id189" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html40.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -10995,13 +10620,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id196" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id189" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id196');"
+                                     onclick="switchState('properties_id189');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id196" style="display:block">
+                           <div id="properties_id189" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -11016,16 +10641,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id196" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id196');"
+                           <div class="floatRight"><input id="button_usedBy_id189" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id189');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id196" style="display:block">
+                           <div id="usedBy_id189" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -11035,12 +10660,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id196" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id196');"
+                           <div class="floatRight"><input id="button_source_id189" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id189');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id196" style="display:block">
+                           <div id="source_id189" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -11064,7 +10689,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id197"></a><div class="componentTitle">Element <span class="qname">locale</span></div>
+      </table><a id="id190"></a><div class="componentTitle">Element <span class="qname">locale</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -11083,13 +10708,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id197" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id190" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id197');"
+                                     onclick="switchState('annotations_id190');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id197" style="display:block">
+                           <div id="annotations_id190" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -11104,12 +10729,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id197" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id197');"
+                           <div class="floatRight"><input id="button_diagram_id190" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id190');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id197" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html134.jpeg" /></div>
+                           <div id="diagram_id190" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html120.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -11119,13 +10744,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id197" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id190" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id197');"
+                                     onclick="switchState('properties_id190');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id197" style="display:block">
+                           <div id="properties_id190" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -11140,16 +10765,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id197" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id197');"
+                           <div class="floatRight"><input id="button_usedBy_id190" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id190');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id197" style="display:block">
+                           <div id="usedBy_id190" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -11159,12 +10784,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id197" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id197');"
+                           <div class="floatRight"><input id="button_source_id190" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id190');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id197" style="display:block">
+                           <div id="source_id190" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -11188,7 +10813,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id198"></a><div class="componentTitle">Element <span class="qname">boot-theme</span></div>
+      </table><a id="id191"></a><div class="componentTitle">Element <span class="qname">boot-theme</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -11207,13 +10832,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id198" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id191" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id198');"
+                                     onclick="switchState('annotations_id191');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id198" style="display:block">
+                           <div id="annotations_id191" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -11228,12 +10853,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id198" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id198');"
+                           <div class="floatRight"><input id="button_diagram_id191" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id191');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id198" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html24.jpeg" /></div>
+                           <div id="diagram_id191" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html1.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -11243,13 +10868,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id198" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id191" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id198');"
+                                     onclick="switchState('properties_id191');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id198" style="display:block">
+                           <div id="properties_id191" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -11264,16 +10889,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id198" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id198');"
+                           <div class="floatRight"><input id="button_usedBy_id191" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id191');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id198" style="display:block">
+                           <div id="usedBy_id191" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -11283,12 +10908,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id198" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id198');"
+                           <div class="floatRight"><input id="button_source_id191" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id191');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id198" style="display:block">
+                           <div id="source_id191" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -11312,7 +10937,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id199"></a><div class="componentTitle">Element <span class="qname">defaultdestination</span></div>
+      </table><a id="id192"></a><div class="componentTitle">Element <span class="qname">defaultdestination</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -11331,13 +10956,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id199" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id192" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id199');"
+                                     onclick="switchState('annotations_id192');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id199" style="display:block">
+                           <div id="annotations_id192" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -11352,12 +10977,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id199" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id199');"
+                           <div class="floatRight"><input id="button_diagram_id192" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id192');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id199" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html54.jpeg" /></div>
+                           <div id="diagram_id192" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html116.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -11367,13 +10992,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id199" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id192" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id199');"
+                                     onclick="switchState('properties_id192');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id199" style="display:block">
+                           <div id="properties_id192" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -11388,16 +11013,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id199" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id199');"
+                           <div class="floatRight"><input id="button_usedBy_id192" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id192');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id199" style="display:block">
+                           <div id="usedBy_id192" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -11407,12 +11032,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id199" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id199');"
+                           <div class="floatRight"><input id="button_source_id192" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id192');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id199" style="display:block">
+                           <div id="source_id192" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -11436,7 +11061,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id200"></a><div class="componentTitle">Element <span class="qname">defaultroot</span></div>
+      </table><a id="id193"></a><div class="componentTitle">Element <span class="qname">defaultroot</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -11455,13 +11080,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id200" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id193" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id200');"
+                                     onclick="switchState('annotations_id193');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id200" style="display:block">
+                           <div id="annotations_id193" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -11476,12 +11101,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id200" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id200');"
+                           <div class="floatRight"><input id="button_diagram_id193" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id193');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id200" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html149.jpeg" /></div>
+                           <div id="diagram_id193" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html143.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -11491,13 +11116,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id200" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id193" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id200');"
+                                     onclick="switchState('properties_id193');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id200" style="display:block">
+                           <div id="properties_id193" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -11512,16 +11137,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id200" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id200');"
+                           <div class="floatRight"><input id="button_usedBy_id193" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id193');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id200" style="display:block">
+                           <div id="usedBy_id193" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -11531,12 +11156,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id200" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id200');"
+                           <div class="floatRight"><input id="button_source_id193" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id193');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id200" style="display:block">
+                           <div id="source_id193" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -11560,7 +11185,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id201"></a><div class="componentTitle">Element <span class="qname">defaultbaseroot</span></div>
+      </table><a id="id194"></a><div class="componentTitle">Element <span class="qname">defaultbaseroot</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -11579,13 +11204,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id201" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id194" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id201');"
+                                     onclick="switchState('annotations_id194');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id201" style="display:block">
+                           <div id="annotations_id194" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -11600,12 +11225,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id201" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id201');"
+                           <div class="floatRight"><input id="button_diagram_id194" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id194');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id201" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html108.jpeg" /></div>
+                           <div id="diagram_id194" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html195.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -11615,13 +11240,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id201" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id194" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id201');"
+                                     onclick="switchState('properties_id194');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id201" style="display:block">
+                           <div id="properties_id194" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -11636,16 +11261,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id201" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id201');"
+                           <div class="floatRight"><input id="button_usedBy_id194" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id194');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id201" style="display:block">
+                           <div id="usedBy_id194" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -11655,12 +11280,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id201" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id201');"
+                           <div class="floatRight"><input id="button_source_id194" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id194');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id201" style="display:block">
+                           <div id="source_id194" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -11684,7 +11309,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id204"></a><div class="componentTitle">Element <span class="qname">profiles</span></div>
+      </table><a id="id197"></a><div class="componentTitle">Element <span class="qname">profiles</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -11703,13 +11328,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id204" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id197" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id204');"
+                                     onclick="switchState('annotations_id197');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id204" style="display:block">
+                           <div id="annotations_id197" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -11724,26 +11349,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id204" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id204');"
+                           <div class="floatRight"><input id="button_diagram_id197" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id197');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id204" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html177.jpeg"
-                                   usemap="#kiwi_46_html177" /><map name="kiwi_46_html177" id="kiwi_46_html177">
-                                 <area alt="kiwi0.tmp#id205" href="kiwi0.html#id205" coords="192,6,258,30" /></map></div>
+                           <div id="diagram_id197" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html18.jpeg" usemap="#kiwi_46_html18" /><map name="kiwi_46_html18" id="kiwi_46_html18">
+                                 <area alt="kiwi0.tmp#id198" href="kiwi0.html#id198" coords="192,6,258,30" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id204" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id197" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id204');"
+                                     onclick="switchState('properties_id197');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id204" style="display:block">
+                           <div id="properties_id197" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -11758,16 +11382,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id204" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id204');"
+                           <div class="floatRight"><input id="button_usedBy_id197" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id197');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id204" style="display:block">
+                           <div id="usedBy_id197" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></td>
                                  </tr>
                               </table>
@@ -11776,23 +11400,23 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id205" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id198" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profile+</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id205" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id198" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profile</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id204" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id204');"
+                           <div class="floatRight"><input id="button_instance_id197" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id197');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id204" style="display:block">
+                           <div id="instance_id197" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -11807,12 +11431,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id204" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id204');"
+                           <div class="floatRight"><input id="button_source_id197" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id197');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id204" style="display:block">
+                           <div id="source_id197" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -11841,7 +11465,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id205"></a><div class="componentTitle">Element <span class="qname">profile</span></div>
+      </table><a id="id198"></a><div class="componentTitle">Element <span class="qname">profile</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -11860,13 +11484,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id205" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id198" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id205');"
+                                     onclick="switchState('annotations_id198');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id205" style="display:block">
+                           <div id="annotations_id198" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -11881,26 +11505,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id205" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id205');"
+                           <div class="floatRight"><input id="button_diagram_id198" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id198');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id205" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html242.jpeg"
-                                   usemap="#kiwi_46_html242" /><map name="kiwi_46_html242" id="kiwi_46_html242">
-                                 <area alt="kiwi0.tmp#id206" href="kiwi0.html#id206" coords="111,43,243,69" /></map></div>
+                           <div id="diagram_id198" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html45.jpeg" usemap="#kiwi_46_html45" /><map name="kiwi_46_html45" id="kiwi_46_html45">
+                                 <area alt="kiwi0.tmp#id199" href="kiwi0.html#id199" coords="111,43,243,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id205" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id198" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id205');"
+                                     onclick="switchState('properties_id198');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id205" style="display:block">
+                           <div id="properties_id198" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -11915,16 +11538,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id205" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id205');"
+                           <div class="floatRight"><input id="button_usedBy_id198" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id198');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id205" style="display:block">
+                           <div id="usedBy_id198" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id197" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
                                  </tr>
                               </table>
@@ -11934,13 +11557,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id205" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id198" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id205');"
+                                     onclick="switchState('attributes_id198');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id205" style="display:block">
+                           <div id="attributes_id198" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -11953,7 +11576,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id209" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id202" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -11971,7 +11594,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id210" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id203" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">import</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -11982,7 +11605,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -12006,12 +11629,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id205" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id205');"
+                           <div class="floatRight"><input id="button_source_id198" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id198');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id205" style="display:block">
+                           <div id="source_id198" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -12038,7 +11661,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id211"></a><div class="componentTitle">Element <span class="qname">instsource</span></div>
+      </table><a id="id204"></a><div class="componentTitle">Element <span class="qname">instsource</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -12057,13 +11680,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id211" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id204" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id211');"
+                                     onclick="switchState('annotations_id204');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id211" style="display:block">
+                           <div id="annotations_id204" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -12078,30 +11701,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id211" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id211');"
+                           <div class="floatRight"><input id="button_diagram_id204" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id204');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id211" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html159.jpeg"
-                                   usemap="#kiwi_46_html159" /><map name="kiwi_46_html159" id="kiwi_46_html159">
-                                 <area alt="kiwi0.tmp#id212" href="kiwi0.html#id212" coords="208,2,310,26" />
-                                 <area alt="kiwi0.tmp#id224" href="kiwi0.html#id224" coords="208,36,323,60" />
-                                 <area alt="kiwi0.tmp#id231" href="kiwi0.html#id231" coords="208,70,395,112" />
-                                 <area alt="kiwi0.tmp#id246" href="kiwi0.html#id246" coords="208,122,288,146" />
-                                 <area alt="kiwi0.tmp#id270" href="kiwi0.html#id270" coords="208,156,314,180" /></map></div>
+                           <div id="diagram_id204" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html263.jpeg"
+                                   usemap="#kiwi_46_html263" /><map name="kiwi_46_html263" id="kiwi_46_html263">
+                                 <area alt="kiwi0.tmp#id205" href="kiwi0.html#id205" coords="208,2,310,26" />
+                                 <area alt="kiwi0.tmp#id217" href="kiwi0.html#id217" coords="208,36,323,60" />
+                                 <area alt="kiwi0.tmp#id224" href="kiwi0.html#id224" coords="208,70,395,112" />
+                                 <area alt="kiwi0.tmp#id239" href="kiwi0.html#id239" coords="208,122,288,146" />
+                                 <area alt="kiwi0.tmp#id263" href="kiwi0.html#id263" coords="208,156,314,180" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id211" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id204" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id211');"
+                                     onclick="switchState('properties_id204');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id211" style="display:block">
+                           <div id="properties_id204" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -12116,16 +11739,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id211" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id211');"
+                           <div class="floatRight"><input id="button_usedBy_id204" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id204');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id211" style="display:block">
+                           <div id="usedBy_id204" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></td>
                                  </tr>
                               </table>
@@ -12134,31 +11757,31 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id212" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">architectures</a></b> | <b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoptions</a></b> | <b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instrepo</a></b> | <b><a href="kiwi0.html#id246" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metadata</a></b> | <b><a href="kiwi0.html#id270" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id205" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">architectures</a></b> | <b><a href="kiwi0.html#id217" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoptions</a></b> | <b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instrepo</a></b> | <b><a href="kiwi0.html#id239" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metadata</a></b> | <b><a href="kiwi0.html#id263" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackages</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id212" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">architectures</a></b>, <b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instrepo</a></b>, <b><a href="kiwi0.html#id246" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metadata</a></b>, <b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoptions</a></b>, <b><a href="kiwi0.html#id270" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id205" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">architectures</a></b>, <b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instrepo</a></b>, <b><a href="kiwi0.html#id239" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metadata</a></b>, <b><a href="kiwi0.html#id217" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoptions</a></b>, <b><a href="kiwi0.html#id263" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackages</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id211" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id211');"
+                           <div class="floatRight"><input id="button_instance_id204" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id204');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id211" style="display:block">
+                           <div id="instance_id204" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -12177,12 +11800,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id211" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id211');"
+                           <div class="floatRight"><input id="button_source_id204" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id204');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id211" style="display:block">
+                           <div id="source_id204" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -12215,7 +11838,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id212"></a><div class="componentTitle">Element <span class="qname">architectures</span></div>
+      </table><a id="id205"></a><div class="componentTitle">Element <span class="qname">architectures</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -12234,13 +11857,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id212" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id205" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id212');"
+                                     onclick="switchState('annotations_id205');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id212" style="display:block">
+                           <div id="annotations_id205" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -12255,27 +11878,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id212" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id212');"
+                           <div class="floatRight"><input id="button_diagram_id205" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id205');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id212" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html229.jpeg"
-                                   usemap="#kiwi_46_html229" /><map name="kiwi_46_html229" id="kiwi_46_html229">
-                                 <area alt="kiwi0.tmp#id213" href="kiwi0.html#id213" coords="222,2,277,26" />
-                                 <area alt="kiwi0.tmp#id220" href="kiwi0.html#id220" coords="222,36,323,60" /></map></div>
+                           <div id="diagram_id205" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html57.jpeg" usemap="#kiwi_46_html57" /><map name="kiwi_46_html57" id="kiwi_46_html57">
+                                 <area alt="kiwi0.tmp#id206" href="kiwi0.html#id206" coords="222,2,277,26" />
+                                 <area alt="kiwi0.tmp#id213" href="kiwi0.html#id213" coords="222,36,323,60" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id212" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id205" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id212');"
+                                     onclick="switchState('properties_id205');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id212" style="display:block">
+                           <div id="properties_id205" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -12290,16 +11912,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id212" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id212');"
+                           <div class="floatRight"><input id="button_usedBy_id205" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id205');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id212" style="display:block">
+                           <div id="usedBy_id205" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instsource</a></b></td>
                                  </tr>
                               </table>
@@ -12308,25 +11930,25 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id213" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b> | <b><a href="kiwi0.html#id220" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id206" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b> | <b><a href="kiwi0.html#id213" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">requiredarch</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id213" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b>, <b><a href="kiwi0.html#id220" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id206" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b>, <b><a href="kiwi0.html#id213" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">requiredarch</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id212" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id212');"
+                           <div class="floatRight"><input id="button_instance_id205" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id205');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id212" style="display:block">
+                           <div id="instance_id205" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -12342,12 +11964,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id212" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id212');"
+                           <div class="floatRight"><input id="button_source_id205" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id205');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id212" style="display:block">
+                           <div id="source_id205" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -12377,7 +11999,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id213"></a><div class="componentTitle">Element <span class="qname">arch</span></div>
+      </table><a id="id206"></a><div class="componentTitle">Element <span class="qname">arch</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -12396,13 +12018,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id213" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id206" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id213');"
+                                     onclick="switchState('annotations_id206');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id213" style="display:block">
+                           <div id="annotations_id206" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -12417,26 +12039,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id213" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id213');"
+                           <div class="floatRight"><input id="button_diagram_id206" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id206');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id213" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html188.jpeg"
-                                   usemap="#kiwi_46_html188" /><map name="kiwi_46_html188" id="kiwi_46_html188">
-                                 <area alt="kiwi0.tmp#id214" href="kiwi0.html#id214" coords="100,43,221,69" /></map></div>
+                           <div id="diagram_id206" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html203.jpeg"
+                                   usemap="#kiwi_46_html203" /><map name="kiwi_46_html203" id="kiwi_46_html203">
+                                 <area alt="kiwi0.tmp#id207" href="kiwi0.html#id207" coords="100,43,221,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id213" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id206" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id213');"
+                                     onclick="switchState('properties_id206');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id213" style="display:block">
+                           <div id="properties_id206" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -12451,16 +12073,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id213" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id213');"
+                           <div class="floatRight"><input id="button_usedBy_id206" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id206');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id213" style="display:block">
+                           <div id="usedBy_id206" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id212" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id205" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">architectures</a></b></td>
                                  </tr>
                               </table>
@@ -12470,13 +12092,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id213" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id206" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id213');"
+                                     onclick="switchState('attributes_id206');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id213" style="display:block">
+                           <div id="attributes_id206" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -12489,7 +12111,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id219" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id212" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">fallback</a></b></td>
                                     <td><b>xs:IDREF</b></td>
                                     <td></td>
@@ -12500,7 +12122,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id217" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id210" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td><b>xs:ID</b></td>
                                     <td></td>
@@ -12518,7 +12140,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -12542,12 +12164,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id213" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id213');"
+                           <div class="floatRight"><input id="button_source_id206" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id206');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id213" style="display:block">
+                           <div id="source_id206" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -12574,7 +12196,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id220"></a><div class="componentTitle">Element <span class="qname">requiredarch</span></div>
+      </table><a id="id213"></a><div class="componentTitle">Element <span class="qname">requiredarch</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -12593,13 +12215,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id220" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id213" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id220');"
+                                     onclick="switchState('annotations_id213');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id220" style="display:block">
+                           <div id="annotations_id213" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -12614,26 +12236,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id220" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id220');"
+                           <div class="floatRight"><input id="button_diagram_id213" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id213');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id220" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html114.jpeg"
-                                   usemap="#kiwi_46_html114" /><map name="kiwi_46_html114" id="kiwi_46_html114">
-                                 <area alt="kiwi0.tmp#id221" href="kiwi0.html#id221" coords="146,43,313,69" /></map></div>
+                           <div id="diagram_id213" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html28.jpeg" usemap="#kiwi_46_html28" /><map name="kiwi_46_html28" id="kiwi_46_html28">
+                                 <area alt="kiwi0.tmp#id214" href="kiwi0.html#id214" coords="146,43,313,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id220" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id213" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id220');"
+                                     onclick="switchState('properties_id213');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id220" style="display:block">
+                           <div id="properties_id213" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -12648,16 +12269,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id220" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id220');"
+                           <div class="floatRight"><input id="button_usedBy_id213" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id213');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id220" style="display:block">
+                           <div id="usedBy_id213" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id212" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id205" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">architectures</a></b></td>
                                  </tr>
                               </table>
@@ -12667,13 +12288,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id220" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id213" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id220');"
+                                     onclick="switchState('attributes_id213');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id220" style="display:block">
+                           <div id="attributes_id213" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -12686,7 +12307,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id223" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id216" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ref</a></b></td>
                                     <td><b>xs:IDREF</b></td>
                                     <td></td>
@@ -12703,12 +12324,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id220" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id220');"
+                           <div class="floatRight"><input id="button_source_id213" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id213');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id220" style="display:block">
+                           <div id="source_id213" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -12735,7 +12356,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id224"></a><div class="componentTitle">Element <span class="qname">productoptions</span></div>
+      </table><a id="id217"></a><div class="componentTitle">Element <span class="qname">productoptions</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -12754,13 +12375,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id224" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id217" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id224');"
+                                     onclick="switchState('annotations_id217');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id224" style="display:block">
+                           <div id="annotations_id217" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -12775,27 +12396,28 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id224" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id224');"
+                           <div class="floatRight"><input id="button_diagram_id217" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id217');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id224" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html2.jpeg" usemap="#kiwi_46_html2" /><map name="kiwi_46_html2" id="kiwi_46_html2">
-                                 <area alt="kiwi0.tmp#id225" href="kiwi0.html#id225" coords="235,2,344,26" />
-                                 <area alt="kiwi0.tmp#id227" href="kiwi0.html#id227" coords="235,36,330,60" />
-                                 <area alt="kiwi0.tmp#id229" href="kiwi0.html#id229" coords="235,70,326,94" /></map></div>
+                           <div id="diagram_id217" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html226.jpeg"
+                                   usemap="#kiwi_46_html226" /><map name="kiwi_46_html226" id="kiwi_46_html226">
+                                 <area alt="kiwi0.tmp#id218" href="kiwi0.html#id218" coords="235,2,344,26" />
+                                 <area alt="kiwi0.tmp#id220" href="kiwi0.html#id220" coords="235,36,330,60" />
+                                 <area alt="kiwi0.tmp#id222" href="kiwi0.html#id222" coords="235,70,326,94" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id224" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id217" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id224');"
+                                     onclick="switchState('properties_id217');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id224" style="display:block">
+                           <div id="properties_id217" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -12810,16 +12432,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id224" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id224');"
+                           <div class="floatRight"><input id="button_usedBy_id217" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id217');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id224" style="display:block">
+                           <div id="usedBy_id217" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instsource</a></b></td>
                                  </tr>
                               </table>
@@ -12828,27 +12450,27 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoption</a></b> | <b><a href="kiwi0.html#id227" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productinfo</a></b> | <b><a href="kiwi0.html#id229" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id218" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoption</a></b> | <b><a href="kiwi0.html#id220" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productinfo</a></b> | <b><a href="kiwi0.html#id222" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productvar</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id227" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productinfo</a></b>, <b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoption</a></b>, <b><a href="kiwi0.html#id229" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id220" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productinfo</a></b>, <b><a href="kiwi0.html#id218" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoption</a></b>, <b><a href="kiwi0.html#id222" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productvar</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id224" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id224');"
+                           <div class="floatRight"><input id="button_instance_id217" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id217');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id224" style="display:block">
+                           <div id="instance_id217" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -12865,12 +12487,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id224" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id224');"
+                           <div class="floatRight"><input id="button_source_id217" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id217');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id224" style="display:block">
+                           <div id="source_id217" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -12901,7 +12523,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id225"></a><div class="componentTitle">Element <span class="qname">productoption</span></div>
+      </table><a id="id218"></a><div class="componentTitle">Element <span class="qname">productoption</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -12920,13 +12542,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id225" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id218" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id225');"
+                                     onclick="switchState('annotations_id218');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id225" style="display:block">
+                           <div id="annotations_id218" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -12941,26 +12563,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id225" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id225');"
+                           <div class="floatRight"><input id="button_diagram_id218" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id218');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id225" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html208.jpeg"
-                                   usemap="#kiwi_46_html208" /><map name="kiwi_46_html208" id="kiwi_46_html208">
-                                 <area alt="kiwi0.tmp#id226" href="kiwi0.html#id226" coords="154,43,329,69" /></map></div>
+                           <div id="diagram_id218" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html100.jpeg"
+                                   usemap="#kiwi_46_html100" /><map name="kiwi_46_html100" id="kiwi_46_html100">
+                                 <area alt="kiwi0.tmp#id219" href="kiwi0.html#id219" coords="154,43,329,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id225" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id218" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id225');"
+                                     onclick="switchState('properties_id218');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id225" style="display:block">
+                           <div id="properties_id218" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -12981,16 +12603,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id225" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id225');"
+                           <div class="floatRight"><input id="button_usedBy_id218" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id218');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id225" style="display:block">
+                           <div id="usedBy_id218" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id217" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoptions</a></b></td>
                                  </tr>
                               </table>
@@ -13004,13 +12626,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id225" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id218" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id225');"
+                                     onclick="switchState('attributes_id218');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id225" style="display:block">
+                           <div id="attributes_id218" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -13023,7 +12645,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -13047,12 +12669,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id225" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id225');"
+                           <div class="floatRight"><input id="button_source_id218" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id218');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id225" style="display:block">
+                           <div id="source_id218" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -13079,7 +12701,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id227"></a><div class="componentTitle">Element <span class="qname">productinfo</span></div>
+      </table><a id="id220"></a><div class="componentTitle">Element <span class="qname">productinfo</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -13098,13 +12720,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id227" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id220" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id227');"
+                                     onclick="switchState('annotations_id220');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id227" style="display:block">
+                           <div id="annotations_id220" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -13119,26 +12741,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id227" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id227');"
+                           <div class="floatRight"><input id="button_diagram_id220" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id220');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id227" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html238.jpeg"
-                                   usemap="#kiwi_46_html238" /><map name="kiwi_46_html238" id="kiwi_46_html238">
-                                 <area alt="kiwi0.tmp#id228" href="kiwi0.html#id228" coords="140,43,301,69" /></map></div>
+                           <div id="diagram_id220" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html123.jpeg"
+                                   usemap="#kiwi_46_html123" /><map name="kiwi_46_html123" id="kiwi_46_html123">
+                                 <area alt="kiwi0.tmp#id221" href="kiwi0.html#id221" coords="140,43,301,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id227" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id220" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id227');"
+                                     onclick="switchState('properties_id220');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id227" style="display:block">
+                           <div id="properties_id220" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -13159,16 +12781,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id227" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id227');"
+                           <div class="floatRight"><input id="button_usedBy_id220" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id220');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id227" style="display:block">
+                           <div id="usedBy_id220" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id217" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoptions</a></b></td>
                                  </tr>
                               </table>
@@ -13182,13 +12804,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id227" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id220" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id227');"
+                                     onclick="switchState('attributes_id220');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id227" style="display:block">
+                           <div id="attributes_id220" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -13201,7 +12823,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -13225,12 +12847,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id227" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id227');"
+                           <div class="floatRight"><input id="button_source_id220" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id220');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id227" style="display:block">
+                           <div id="source_id220" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -13257,7 +12879,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id229"></a><div class="componentTitle">Element <span class="qname">productvar</span></div>
+      </table><a id="id222"></a><div class="componentTitle">Element <span class="qname">productvar</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -13276,13 +12898,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id229" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id222" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id229');"
+                                     onclick="switchState('annotations_id222');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id229" style="display:block">
+                           <div id="annotations_id222" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -13297,25 +12919,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id229" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id229');"
+                           <div class="floatRight"><input id="button_diagram_id222" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id222');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id229" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html72.jpeg" usemap="#kiwi_46_html72" /><map name="kiwi_46_html72" id="kiwi_46_html72">
-                                 <area alt="kiwi0.tmp#id230" href="kiwi0.html#id230" coords="136,43,293,69" /></map></div>
+                           <div id="diagram_id222" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html246.jpeg"
+                                   usemap="#kiwi_46_html246" /><map name="kiwi_46_html246" id="kiwi_46_html246">
+                                 <area alt="kiwi0.tmp#id223" href="kiwi0.html#id223" coords="136,43,293,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id229" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id222" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id229');"
+                                     onclick="switchState('properties_id222');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id229" style="display:block">
+                           <div id="properties_id222" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -13336,16 +12959,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id229" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id229');"
+                           <div class="floatRight"><input id="button_usedBy_id222" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id222');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id229" style="display:block">
+                           <div id="usedBy_id222" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id217" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoptions</a></b></td>
                                  </tr>
                               </table>
@@ -13359,13 +12982,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id229" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id222" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id229');"
+                                     onclick="switchState('attributes_id222');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id229" style="display:block">
+                           <div id="attributes_id222" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -13378,7 +13001,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -13402,12 +13025,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id229" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id229');"
+                           <div class="floatRight"><input id="button_source_id222" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id222');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id229" style="display:block">
+                           <div id="source_id222" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -13434,7 +13057,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id231"></a><div class="componentTitle">Element <span class="qname">instrepo</span></div>
+      </table><a id="id224"></a><div class="componentTitle">Element <span class="qname">instrepo</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -13453,13 +13076,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id231" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id224" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id231');"
+                                     onclick="switchState('annotations_id224');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id231" style="display:block">
+                           <div id="annotations_id224" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -13474,28 +13097,28 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id231" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id231');"
+                           <div class="floatRight"><input id="button_diagram_id224" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id224');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id231" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html197.jpeg"
-                                   usemap="#kiwi_46_html197" /><map name="kiwi_46_html197" id="kiwi_46_html197">
-                                 <area alt="kiwi0.tmp#id233" href="kiwi0.html#id233" coords="300,46,368,70" />
-                                 <area alt="kiwi0.tmp#id232" href="kiwi0.html#id232" coords="218,5,407,27" />
-                                 <area alt="kiwi0.tmp#id238" href="kiwi0.html#id238" coords="232,132,374,158" /></map></div>
+                           <div id="diagram_id224" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html180.jpeg"
+                                   usemap="#kiwi_46_html180" /><map name="kiwi_46_html180" id="kiwi_46_html180">
+                                 <area alt="kiwi0.tmp#id226" href="kiwi0.html#id226" coords="300,46,368,70" />
+                                 <area alt="kiwi0.tmp#id225" href="kiwi0.html#id225" coords="218,5,407,27" />
+                                 <area alt="kiwi0.tmp#id231" href="kiwi0.html#id231" coords="232,132,374,158" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td>extension of <b><a href="kiwi0.html#id232" target="mainFrame" title="No namespace"
+                        <td>extension of <b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type hierarchy</b></td>
                         <td>
                            <ul>
-                              <li><b><a href="kiwi0.html#id232" target="mainFrame" title="No namespace"
+                              <li><b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source</a></b></li>
                            </ul>
                         </td>
@@ -13503,13 +13126,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id231" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id224" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id231');"
+                                     onclick="switchState('properties_id224');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id231" style="display:block">
+                           <div id="properties_id224" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -13524,16 +13147,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id231" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id231');"
+                           <div class="floatRight"><input id="button_usedBy_id224" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id224');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id231" style="display:block">
+                           <div id="usedBy_id224" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instsource</a></b></td>
                                  </tr>
                               </table>
@@ -13542,23 +13165,23 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id233" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id233" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id231" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id231');"
+                           <div class="floatRight"><input id="button_instance_id224" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id224');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id231" style="display:block">
+                           <div id="instance_id224" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -13573,13 +13196,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id231" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id224" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id231');"
+                                     onclick="switchState('attributes_id224');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id231" style="display:block">
+                           <div id="attributes_id224" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -13592,7 +13215,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id245" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id238" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">local</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -13603,7 +13226,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id240" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id233" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td><b>xs:ID</b></td>
                                     <td></td>
@@ -13614,7 +13237,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id242" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id235" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">priority</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -13632,7 +13255,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id244" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id237" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pwd</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -13650,7 +13273,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id243" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id236" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">username</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -13674,12 +13297,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id231" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id231');"
+                           <div class="floatRight"><input id="button_source_id224" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id224');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id231" style="display:block">
+                           <div id="source_id224" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -13710,7 +13333,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id233"></a><div class="componentTitle">Element <span class="qname">source</span></div>
+      </table><a id="id226"></a><div class="componentTitle">Element <span class="qname">source</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -13729,13 +13352,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id233" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id226" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id233');"
+                                     onclick="switchState('annotations_id226');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id233" style="display:block">
+                           <div id="annotations_id226" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -13750,25 +13373,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id233" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id233');"
+                           <div class="floatRight"><input id="button_diagram_id226" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id226');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id233" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html0.jpeg" usemap="#kiwi_46_html0" /><map name="kiwi_46_html0" id="kiwi_46_html0">
-                                 <area alt="kiwi0.tmp#id234" href="kiwi0.html#id234" coords="113,43,247,69" /></map></div>
+                           <div id="diagram_id226" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html194.jpeg"
+                                   usemap="#kiwi_46_html194" /><map name="kiwi_46_html194" id="kiwi_46_html194">
+                                 <area alt="kiwi0.tmp#id227" href="kiwi0.html#id227" coords="113,43,247,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id233" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id226" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id233');"
+                                     onclick="switchState('properties_id226');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id233" style="display:block">
+                           <div id="properties_id226" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -13783,22 +13407,22 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id233" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id233');"
+                           <div class="floatRight"><input id="button_usedBy_id226" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id226');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id233" style="display:block">
+                           <div id="usedBy_id226" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Complex Type </td>
-                                    <td><b><a href="kiwi0.html#id232" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source</a></b></td>
                                  </tr>
                                  <tr>
                                     <td class="firstColumn">Elements </td>
-                                    <td><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instrepo</a></b>, <b><a href="kiwi0.html#id293" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instrepo</a></b>, <b><a href="kiwi0.html#id286" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repository</a></b></td>
                                  </tr>
                               </table>
@@ -13808,13 +13432,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id233" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id226" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id233');"
+                                     onclick="switchState('attributes_id226');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id233" style="display:block">
+                           <div id="attributes_id226" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -13827,7 +13451,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id237" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id230" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">path</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -13851,12 +13475,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id233" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id233');"
+                           <div class="floatRight"><input id="button_source_id226" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id226');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id233" style="display:block">
+                           <div id="source_id226" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -13883,7 +13507,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id246"></a><div class="componentTitle">Element <span class="qname">metadata</span></div>
+      </table><a id="id239"></a><div class="componentTitle">Element <span class="qname">metadata</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -13902,13 +13526,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id246" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id239" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id246');"
+                                     onclick="switchState('annotations_id239');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id246" style="display:block">
+                           <div id="annotations_id239" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -13923,27 +13547,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id246" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id246');"
+                           <div class="floatRight"><input id="button_diagram_id239" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id239');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id246" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html61.jpeg" usemap="#kiwi_46_html61" /><map name="kiwi_46_html61" id="kiwi_46_html61">
-                                 <area alt="kiwi0.tmp#id247" href="kiwi0.html#id247" coords="200,2,300,26" />
-                                 <area alt="kiwi0.tmp#id258" href="kiwi0.html#id258" coords="200,36,273,60" />
-                                 <area alt="kiwi0.tmp#id267" href="kiwi0.html#id267" coords="200,70,267,94" /></map></div>
+                           <div id="diagram_id239" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html39.jpeg" usemap="#kiwi_46_html39" /><map name="kiwi_46_html39" id="kiwi_46_html39">
+                                 <area alt="kiwi0.tmp#id240" href="kiwi0.html#id240" coords="200,2,300,26" />
+                                 <area alt="kiwi0.tmp#id251" href="kiwi0.html#id251" coords="200,36,273,60" />
+                                 <area alt="kiwi0.tmp#id260" href="kiwi0.html#id260" coords="200,70,267,94" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id246" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id239" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id246');"
+                                     onclick="switchState('properties_id239');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id246" style="display:block">
+                           <div id="properties_id239" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -13958,16 +13582,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id246" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id246');"
+                           <div class="floatRight"><input id="button_usedBy_id239" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id239');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id246" style="display:block">
+                           <div id="usedBy_id239" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instsource</a></b></td>
                                  </tr>
                               </table>
@@ -13976,27 +13600,27 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id247" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackage</a></b> | <b><a href="kiwi0.html#id258" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metafile</a></b> | <b><a href="kiwi0.html#id267" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id240" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackage</a></b> | <b><a href="kiwi0.html#id251" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metafile</a></b> | <b><a href="kiwi0.html#id260" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">chroot</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id267" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">chroot</a></b>, <b><a href="kiwi0.html#id258" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metafile</a></b>, <b><a href="kiwi0.html#id247" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id260" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">chroot</a></b>, <b><a href="kiwi0.html#id251" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metafile</a></b>, <b><a href="kiwi0.html#id240" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackage</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id246" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id246');"
+                           <div class="floatRight"><input id="button_instance_id239" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id239');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id246" style="display:block">
+                           <div id="instance_id239" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -14013,12 +13637,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id246" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id246');"
+                           <div class="floatRight"><input id="button_source_id239" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id239');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id246" style="display:block">
+                           <div id="source_id239" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -14049,7 +13673,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id247"></a><div class="componentTitle">Element <span class="qname">repopackage</span></div>
+      </table><a id="id240"></a><div class="componentTitle">Element <span class="qname">repopackage</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -14068,13 +13692,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id247" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id240" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id247');"
+                                     onclick="switchState('annotations_id240');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id247" style="display:block">
+                           <div id="annotations_id240" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -14089,26 +13713,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id247" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id247');"
+                           <div class="floatRight"><input id="button_diagram_id240" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id240');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id247" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html128.jpeg"
-                                   usemap="#kiwi_46_html128" /><map name="kiwi_46_html128" id="kiwi_46_html128">
-                                 <area alt="kiwi0.tmp#id248" href="kiwi0.html#id248" coords="145,43,311,69" /></map></div>
+                           <div id="diagram_id240" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html260.jpeg"
+                                   usemap="#kiwi_46_html260" /><map name="kiwi_46_html260" id="kiwi_46_html260">
+                                 <area alt="kiwi0.tmp#id241" href="kiwi0.html#id241" coords="145,43,311,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id247" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id240" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id247');"
+                                     onclick="switchState('properties_id240');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id247" style="display:block">
+                           <div id="properties_id240" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -14123,17 +13747,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id247" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id247');"
+                           <div class="floatRight"><input id="button_usedBy_id240" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id240');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id247" style="display:block">
+                           <div id="usedBy_id240" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Elements </td>
-                                    <td><b><a href="kiwi0.html#id246" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metadata</a></b>, <b><a href="kiwi0.html#id270" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id239" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metadata</a></b>, <b><a href="kiwi0.html#id263" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackages</a></b></td>
                                  </tr>
                               </table>
@@ -14143,13 +13767,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id247" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id240" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id247');"
+                                     onclick="switchState('attributes_id240');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id247" style="display:block">
+                           <div id="attributes_id240" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -14162,7 +13786,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id252" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id245" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">addarch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -14173,7 +13797,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id250" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id243" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -14191,7 +13815,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id251" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id244" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">forcerepo</a></b></td>
                                     <td><b>xs:IDREF</b></td>
                                     <td></td>
@@ -14209,7 +13833,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id257" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id250" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">medium</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -14220,7 +13844,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -14238,7 +13862,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id254" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id247" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">onlyarch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -14249,7 +13873,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id253" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id246" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">removearch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -14260,7 +13884,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id256" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id249" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">script</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -14271,7 +13895,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id255" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -14288,12 +13912,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id247" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id247');"
+                           <div class="floatRight"><input id="button_source_id240" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id240');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id247" style="display:block">
+                           <div id="source_id240" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -14320,7 +13944,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id258"></a><div class="componentTitle">Element <span class="qname">metafile</span></div>
+      </table><a id="id251"></a><div class="componentTitle">Element <span class="qname">metafile</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -14339,13 +13963,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id258" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id251" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id258');"
+                                     onclick="switchState('annotations_id251');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id258" style="display:block">
+                           <div id="annotations_id251" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -14360,25 +13984,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id258" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id258');"
+                           <div class="floatRight"><input id="button_diagram_id251" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id251');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id258" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html68.jpeg" usemap="#kiwi_46_html68" /><map name="kiwi_46_html68" id="kiwi_46_html68">
-                                 <area alt="kiwi0.tmp#id259" href="kiwi0.html#id259" coords="118,43,257,69" /></map></div>
+                           <div id="diagram_id251" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html144.jpeg"
+                                   usemap="#kiwi_46_html144" /><map name="kiwi_46_html144" id="kiwi_46_html144">
+                                 <area alt="kiwi0.tmp#id252" href="kiwi0.html#id252" coords="118,43,257,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id258" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id251" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id258');"
+                                     onclick="switchState('properties_id251');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id258" style="display:block">
+                           <div id="properties_id251" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -14393,16 +14018,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id258" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id258');"
+                           <div class="floatRight"><input id="button_usedBy_id251" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id251');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id258" style="display:block">
+                           <div id="usedBy_id251" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id246" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id239" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metadata</a></b></td>
                                  </tr>
                               </table>
@@ -14412,13 +14037,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id258" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id251" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id258');"
+                                     onclick="switchState('attributes_id251');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id258" style="display:block">
+                           <div id="attributes_id251" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -14431,7 +14056,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id264" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id257" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">script</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -14442,7 +14067,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id259" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">target</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -14460,7 +14085,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id261" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id254" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">url</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -14484,12 +14109,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id258" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id258');"
+                           <div class="floatRight"><input id="button_source_id251" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id251');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id258" style="display:block">
+                           <div id="source_id251" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -14516,7 +14141,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id267"></a><div class="componentTitle">Element <span class="qname">chroot</span></div>
+      </table><a id="id260"></a><div class="componentTitle">Element <span class="qname">chroot</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -14535,13 +14160,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id267" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id260" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id267');"
+                                     onclick="switchState('annotations_id260');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id267" style="display:block">
+                           <div id="annotations_id260" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -14556,25 +14181,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id267" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id267');"
+                           <div class="floatRight"><input id="button_diagram_id260" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id260');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id267" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html9.jpeg" usemap="#kiwi_46_html9" /><map name="kiwi_46_html9" id="kiwi_46_html9">
-                                 <area alt="kiwi0.tmp#id268" href="kiwi0.html#id268" coords="112,43,245,69" /></map></div>
+                           <div id="diagram_id260" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html114.jpeg"
+                                   usemap="#kiwi_46_html114" /><map name="kiwi_46_html114" id="kiwi_46_html114">
+                                 <area alt="kiwi0.tmp#id261" href="kiwi0.html#id261" coords="112,43,245,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id267" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id260" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id267');"
+                                     onclick="switchState('properties_id260');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id267" style="display:block">
+                           <div id="properties_id260" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -14595,16 +14221,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id267" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id267');"
+                           <div class="floatRight"><input id="button_usedBy_id260" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id260');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id267" style="display:block">
+                           <div id="usedBy_id260" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id246" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id239" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metadata</a></b></td>
                                  </tr>
                               </table>
@@ -14618,13 +14244,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id267" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id260" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id267');"
+                                     onclick="switchState('attributes_id260');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id267" style="display:block">
+                           <div id="attributes_id260" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -14637,7 +14263,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id269" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id262" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">requires</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -14654,12 +14280,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id267" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id267');"
+                           <div class="floatRight"><input id="button_source_id260" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id260');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id267" style="display:block">
+                           <div id="source_id260" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -14686,7 +14312,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id270"></a><div class="componentTitle">Element <span class="qname">repopackages</span></div>
+      </table><a id="id263"></a><div class="componentTitle">Element <span class="qname">repopackages</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -14705,13 +14331,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id270" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id263" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id270');"
+                                     onclick="switchState('annotations_id263');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id270" style="display:block">
+                           <div id="annotations_id263" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -14726,26 +14352,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id270" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id270');"
+                           <div class="floatRight"><input id="button_diagram_id263" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id263');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id270" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html204.jpeg"
-                                   usemap="#kiwi_46_html204" /><map name="kiwi_46_html204" id="kiwi_46_html204">
-                                 <area alt="kiwi0.tmp#id247" href="kiwi0.html#id247" coords="226,6,326,30" /></map></div>
+                           <div id="diagram_id263" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html50.jpeg" usemap="#kiwi_46_html50" /><map name="kiwi_46_html50" id="kiwi_46_html50">
+                                 <area alt="kiwi0.tmp#id240" href="kiwi0.html#id240" coords="226,6,326,30" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id270" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id263" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id270');"
+                                     onclick="switchState('properties_id263');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id270" style="display:block">
+                           <div id="properties_id263" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -14760,16 +14385,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id270" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id270');"
+                           <div class="floatRight"><input id="button_usedBy_id263" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id263');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id270" style="display:block">
+                           <div id="usedBy_id263" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instsource</a></b></td>
                                  </tr>
                               </table>
@@ -14778,23 +14403,23 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id247" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id240" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackage*</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id247" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id240" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackage</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id270" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id270');"
+                           <div class="floatRight"><input id="button_instance_id263" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id263');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id270" style="display:block">
+                           <div id="instance_id263" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -14809,12 +14434,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id270" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id270');"
+                           <div class="floatRight"><input id="button_source_id263" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id263');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id270" style="display:block">
+                           <div id="source_id263" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -14843,7 +14468,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id271"></a><div class="componentTitle">Element <span class="qname">users</span></div>
+      </table><a id="id264"></a><div class="componentTitle">Element <span class="qname">users</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -14862,13 +14487,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id271" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id264" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id271');"
+                                     onclick="switchState('annotations_id264');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id271" style="display:block">
+                           <div id="annotations_id264" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -14883,27 +14508,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id271" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id271');"
+                           <div class="floatRight"><input id="button_diagram_id264" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id264');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id271" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html230.jpeg"
-                                   usemap="#kiwi_46_html230" /><map name="kiwi_46_html230" id="kiwi_46_html230">
-                                 <area alt="kiwi0.tmp#id284" href="kiwi0.html#id284" coords="106,43,233,69" />
-                                 <area alt="kiwi0.tmp#id272" href="kiwi0.html#id272" coords="181,95,236,119" /></map></div>
+                           <div id="diagram_id264" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html69.jpeg" usemap="#kiwi_46_html69" /><map name="kiwi_46_html69" id="kiwi_46_html69">
+                                 <area alt="kiwi0.tmp#id277" href="kiwi0.html#id277" coords="106,43,233,69" />
+                                 <area alt="kiwi0.tmp#id265" href="kiwi0.html#id265" coords="181,95,236,119" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id271" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id264" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id271');"
+                                     onclick="switchState('properties_id264');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id271" style="display:block">
+                           <div id="properties_id264" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -14918,16 +14542,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id271" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id271');"
+                           <div class="floatRight"><input id="button_usedBy_id264" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id264');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id271" style="display:block">
+                           <div id="usedBy_id264" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></td>
                                  </tr>
                               </table>
@@ -14936,23 +14560,23 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id272" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id265" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">user+</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id272" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id265" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">user</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id271" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id271');"
+                           <div class="floatRight"><input id="button_instance_id264" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id264');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id271" style="display:block">
+                           <div id="instance_id264" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -14967,13 +14591,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id271" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id264" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id271');"
+                                     onclick="switchState('attributes_id264');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id271" style="display:block">
+                           <div id="attributes_id264" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -14986,7 +14610,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id286" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id279" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">group</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -15004,7 +14628,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id280" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -15028,12 +14652,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id271" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id271');"
+                           <div class="floatRight"><input id="button_source_id264" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id264');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id271" style="display:block">
+                           <div id="source_id264" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -15063,7 +14687,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id272"></a><div class="componentTitle">Element <span class="qname">user</span></div>
+      </table><a id="id265"></a><div class="componentTitle">Element <span class="qname">user</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -15082,13 +14706,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id272" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id265" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id272');"
+                                     onclick="switchState('annotations_id265');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id272" style="display:block">
+                           <div id="annotations_id265" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -15103,26 +14727,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id272" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id272');"
+                           <div class="floatRight"><input id="button_diagram_id265" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id265');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id272" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html236.jpeg"
-                                   usemap="#kiwi_46_html236" /><map name="kiwi_46_html236" id="kiwi_46_html236">
-                                 <area alt="kiwi0.tmp#id273" href="kiwi0.html#id273" coords="100,43,221,69" /></map></div>
+                           <div id="diagram_id265" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html37.jpeg" usemap="#kiwi_46_html37" /><map name="kiwi_46_html37" id="kiwi_46_html37">
+                                 <area alt="kiwi0.tmp#id266" href="kiwi0.html#id266" coords="100,43,221,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id272" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id265" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id272');"
+                                     onclick="switchState('properties_id265');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id272" style="display:block">
+                           <div id="properties_id265" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -15137,16 +14760,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id272" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id272');"
+                           <div class="floatRight"><input id="button_usedBy_id265" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id265');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id272" style="display:block">
+                           <div id="usedBy_id265" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id271" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id264" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">users</a></b></td>
                                  </tr>
                               </table>
@@ -15156,13 +14779,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id272" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id265" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id272');"
+                                     onclick="switchState('attributes_id265');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id272" style="display:block">
+                           <div id="attributes_id265" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -15175,7 +14798,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id282" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id275" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">home</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -15193,7 +14816,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id275" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id268" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -15211,7 +14834,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -15229,7 +14852,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id279" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id272" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pwd</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -15247,7 +14870,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id280" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pwdformat</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -15265,7 +14888,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id276" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id269" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">realname</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -15283,7 +14906,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id283" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id276" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">shell</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -15307,12 +14930,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id272" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id272');"
+                           <div class="floatRight"><input id="button_source_id265" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id265');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id272" style="display:block">
+                           <div id="source_id265" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -15339,7 +14962,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id288"></a><div class="componentTitle">Element <span class="qname">drivers</span></div>
+      </table><a id="id281"></a><div class="componentTitle">Element <span class="qname">drivers</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -15358,13 +14981,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id288" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id281" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id288');"
+                                     onclick="switchState('annotations_id281');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id288" style="display:block">
+                           <div id="annotations_id281" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -15379,27 +15002,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id288" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id288');"
+                           <div class="floatRight"><input id="button_diagram_id281" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id281');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id288" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html122.jpeg"
-                                   usemap="#kiwi_46_html122" /><map name="kiwi_46_html122" id="kiwi_46_html122">
-                                 <area alt="kiwi0.tmp#id289" href="kiwi0.html#id289" coords="114,43,249,69" />
-                                 <area alt="kiwi0.tmp#id116" href="kiwi0.html#id116" coords="189,95,244,119" /></map></div>
+                           <div id="diagram_id281" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html3.jpeg" usemap="#kiwi_46_html3" /><map name="kiwi_46_html3" id="kiwi_46_html3">
+                                 <area alt="kiwi0.tmp#id282" href="kiwi0.html#id282" coords="114,43,249,69" />
+                                 <area alt="kiwi0.tmp#id121" href="kiwi0.html#id121" coords="189,95,244,119" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id288" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id281" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id288');"
+                                     onclick="switchState('properties_id281');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id288" style="display:block">
+                           <div id="properties_id281" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -15414,16 +15036,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id288" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id288');"
+                           <div class="floatRight"><input id="button_usedBy_id281" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id281');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id288" style="display:block">
+                           <div id="usedBy_id281" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></td>
                                  </tr>
                               </table>
@@ -15432,23 +15054,23 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">file+</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">file</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id288" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id288');"
+                           <div class="floatRight"><input id="button_instance_id281" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id281');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id288" style="display:block">
+                           <div id="instance_id281" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -15463,13 +15085,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id288" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id281" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id288');"
+                                     onclick="switchState('attributes_id281');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id288" style="display:block">
+                           <div id="attributes_id281" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -15482,7 +15104,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id292" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id285" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -15500,7 +15122,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id291" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id284" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -15517,12 +15139,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id288" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id288');"
+                           <div class="floatRight"><input id="button_source_id281" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id281');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id288" style="display:block">
+                           <div id="source_id281" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -15552,7 +15174,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id293"></a><div class="componentTitle">Element <span class="qname">repository</span></div>
+      </table><a id="id286"></a><div class="componentTitle">Element <span class="qname">repository</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -15571,13 +15193,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id293" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id286" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id293');"
+                                     onclick="switchState('annotations_id286');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id293" style="display:block">
+                           <div id="annotations_id286" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -15592,28 +15214,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id293" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id293');"
+                           <div class="floatRight"><input id="button_diagram_id286" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id286');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id293" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html288.jpeg"
-                                   usemap="#kiwi_46_html288" /><map name="kiwi_46_html288" id="kiwi_46_html288">
-                                 <area alt="kiwi0.tmp#id233" href="kiwi0.html#id233" coords="300,46,368,70" />
-                                 <area alt="kiwi0.tmp#id232" href="kiwi0.html#id232" coords="218,5,407,27" />
-                                 <area alt="kiwi0.tmp#id294" href="kiwi0.html#id294" coords="232,132,385,158" /></map></div>
+                           <div id="diagram_id286" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html87.jpeg" usemap="#kiwi_46_html87" /><map name="kiwi_46_html87" id="kiwi_46_html87">
+                                 <area alt="kiwi0.tmp#id226" href="kiwi0.html#id226" coords="300,46,368,70" />
+                                 <area alt="kiwi0.tmp#id225" href="kiwi0.html#id225" coords="218,5,407,27" />
+                                 <area alt="kiwi0.tmp#id287" href="kiwi0.html#id287" coords="232,132,385,158" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td>extension of <b><a href="kiwi0.html#id232" target="mainFrame" title="No namespace"
+                        <td>extension of <b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type hierarchy</b></td>
                         <td>
                            <ul>
-                              <li><b><a href="kiwi0.html#id232" target="mainFrame" title="No namespace"
+                              <li><b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source</a></b></li>
                            </ul>
                         </td>
@@ -15621,13 +15242,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id293" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id286" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id293');"
+                                     onclick="switchState('properties_id286');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id293" style="display:block">
+                           <div id="properties_id286" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -15642,16 +15263,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id293" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id293');"
+                           <div class="floatRight"><input id="button_usedBy_id286" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id286');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id293" style="display:block">
+                           <div id="usedBy_id286" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></td>
                                  </tr>
                               </table>
@@ -15660,23 +15281,23 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id233" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id233" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id293" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id293');"
+                           <div class="floatRight"><input id="button_instance_id286" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id286');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id293" style="display:block">
+                           <div id="instance_id286" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -15691,13 +15312,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id293" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id286" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id293');"
+                                     onclick="switchState('attributes_id286');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id293" style="display:block">
+                           <div id="attributes_id286" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -15710,7 +15331,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id299" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id292" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">alias</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -15721,7 +15342,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id300" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id293" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">priority</a></b></td>
                                     <td><b>xs:integer</b></td>
                                     <td></td>
@@ -15732,7 +15353,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id297" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id290" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -15750,7 +15371,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id298" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id291" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">status</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -15761,7 +15382,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id289" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -15785,12 +15406,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id293" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id293');"
+                           <div class="floatRight"><input id="button_source_id286" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id286');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id293" style="display:block">
+                           <div id="source_id286" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -15821,7 +15442,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id301"></a><div class="componentTitle">Element <span class="qname">packages</span></div>
+      </table><a id="id294"></a><div class="componentTitle">Element <span class="qname">packages</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -15840,13 +15461,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id301" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id294" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id301');"
+                                     onclick="switchState('annotations_id294');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id301" style="display:block">
+                           <div id="annotations_id294" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -15861,31 +15482,32 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id301" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id301');"
+                           <div class="floatRight"><input id="button_diagram_id294" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id294');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id301" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html18.jpeg" usemap="#kiwi_46_html18" /><map name="kiwi_46_html18" id="kiwi_46_html18">
-                                 <area alt="kiwi0.tmp#id328" href="kiwi0.html#id328" coords="147,43,294,69" />
-                                 <area alt="kiwi0.tmp#id302" href="kiwi0.html#id302" coords="201,91,276,115" />
-                                 <area alt="kiwi0.tmp#id309" href="kiwi0.html#id309" coords="201,125,322,149" />
-                                 <area alt="kiwi0.tmp#id313" href="kiwi0.html#id313" coords="201,159,287,183" />
-                                 <area alt="kiwi0.tmp#id317" href="kiwi0.html#id317" coords="201,193,326,217" />
-                                 <area alt="kiwi0.tmp#id321" href="kiwi0.html#id321" coords="201,227,267,251" />
-                                 <area alt="kiwi0.tmp#id324" href="kiwi0.html#id324" coords="201,261,271,285" /></map></div>
+                           <div id="diagram_id294" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html201.jpeg"
+                                   usemap="#kiwi_46_html201" /><map name="kiwi_46_html201" id="kiwi_46_html201">
+                                 <area alt="kiwi0.tmp#id321" href="kiwi0.html#id321" coords="147,43,294,69" />
+                                 <area alt="kiwi0.tmp#id295" href="kiwi0.html#id295" coords="201,91,276,115" />
+                                 <area alt="kiwi0.tmp#id302" href="kiwi0.html#id302" coords="201,125,322,149" />
+                                 <area alt="kiwi0.tmp#id306" href="kiwi0.html#id306" coords="201,159,287,183" />
+                                 <area alt="kiwi0.tmp#id310" href="kiwi0.html#id310" coords="201,193,326,217" />
+                                 <area alt="kiwi0.tmp#id314" href="kiwi0.html#id314" coords="201,227,267,251" />
+                                 <area alt="kiwi0.tmp#id317" href="kiwi0.html#id317" coords="201,261,271,285" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id301" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id294" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id301');"
+                                     onclick="switchState('properties_id294');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id301" style="display:block">
+                           <div id="properties_id294" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -15900,16 +15522,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id301" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id301');"
+                           <div class="floatRight"><input id="button_usedBy_id294" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id294');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id301" style="display:block">
+                           <div id="usedBy_id294" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></td>
                                  </tr>
                               </table>
@@ -15918,33 +15540,33 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id302" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">package</a></b> | <b><a href="kiwi0.html#id309" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensusePattern</a></b> | <b><a href="kiwi0.html#id313" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rhelGroup</a></b> | <b><a href="kiwi0.html#id317" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensuseProduct</a></b> | <b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ignore</a></b> | <b><a href="kiwi0.html#id324" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id295" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">package</a></b> | <b><a href="kiwi0.html#id302" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensusePattern</a></b> | <b><a href="kiwi0.html#id306" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rhelGroup</a></b> | <b><a href="kiwi0.html#id310" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensuseProduct</a></b> | <b><a href="kiwi0.html#id314" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ignore</a></b> | <b><a href="kiwi0.html#id317" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">archive</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id324" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">archive</a></b>, <b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ignore</a></b>, <b><a href="kiwi0.html#id309" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensusePattern</a></b>, <b><a href="kiwi0.html#id317" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensuseProduct</a></b>, <b><a href="kiwi0.html#id302" target="mainFrame" title="No namespace"
-                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">package</a></b>, <b><a href="kiwi0.html#id313" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id317" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">archive</a></b>, <b><a href="kiwi0.html#id314" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ignore</a></b>, <b><a href="kiwi0.html#id302" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensusePattern</a></b>, <b><a href="kiwi0.html#id310" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensuseProduct</a></b>, <b><a href="kiwi0.html#id295" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">package</a></b>, <b><a href="kiwi0.html#id306" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rhelGroup</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Instance</b></div>
-                           <div class="floatRight"><input id="button_instance_id301" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('instance_id301');"
+                           <div class="floatRight"><input id="button_instance_id294" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('instance_id294');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="instance_id301" style="display:block">
+                           <div id="instance_id294" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -15964,13 +15586,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id301" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id294" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id301');"
+                                     onclick="switchState('attributes_id294');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id301" style="display:block">
+                           <div id="attributes_id294" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -15983,7 +15605,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id332" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id325" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">patternType</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -15994,7 +15616,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id331" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id324" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -16005,7 +15627,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id330" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id323" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -16022,12 +15644,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id301" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id301');"
+                           <div class="floatRight"><input id="button_source_id294" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id294');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id301" style="display:block">
+                           <div id="source_id294" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -16062,7 +15684,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id302"></a><div class="componentTitle">Element <span class="qname">package</span></div>
+      </table><a id="id295"></a><div class="componentTitle">Element <span class="qname">package</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -16081,13 +15703,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id302" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id295" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id302');"
+                                     onclick="switchState('annotations_id295');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id302" style="display:block">
+                           <div id="annotations_id295" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -16102,26 +15724,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id302" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id302');"
+                           <div class="floatRight"><input id="button_diagram_id295" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id295');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id302" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html220.jpeg"
-                                   usemap="#kiwi_46_html220" /><map name="kiwi_46_html220" id="kiwi_46_html220">
-                                 <area alt="kiwi0.tmp#id303" href="kiwi0.html#id303" coords="120,43,261,69" /></map></div>
+                           <div id="diagram_id295" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html266.jpeg"
+                                   usemap="#kiwi_46_html266" /><map name="kiwi_46_html266" id="kiwi_46_html266">
+                                 <area alt="kiwi0.tmp#id296" href="kiwi0.html#id296" coords="120,43,261,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id302" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id295" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id302');"
+                                     onclick="switchState('properties_id295');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id302" style="display:block">
+                           <div id="properties_id295" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -16136,16 +15758,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id302" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id302');"
+                           <div class="floatRight"><input id="button_usedBy_id295" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id295');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id302" style="display:block">
+                           <div id="usedBy_id295" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packages</a></b></td>
                                  </tr>
                               </table>
@@ -16155,13 +15777,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id302" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id295" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id302');"
+                                     onclick="switchState('attributes_id295');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id302" style="display:block">
+                           <div id="attributes_id295" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -16174,7 +15796,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id305" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id298" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -16192,7 +15814,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id307" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id300" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootdelete</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -16203,7 +15825,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id308" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootinclude</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -16214,7 +15836,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -16232,7 +15854,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id306" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id299" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">replaces</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -16256,12 +15878,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id302" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id302');"
+                           <div class="floatRight"><input id="button_source_id295" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id295');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id302" style="display:block">
+                           <div id="source_id295" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -16288,7 +15910,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id309"></a><div class="componentTitle">Element <span class="qname">opensusePattern</span></div>
+      </table><a id="id302"></a><div class="componentTitle">Element <span class="qname">opensusePattern</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -16307,13 +15929,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id309" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id302" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id309');"
+                                     onclick="switchState('annotations_id302');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id309" style="display:block">
+                           <div id="annotations_id302" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -16328,25 +15950,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id309" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id309');"
+                           <div class="floatRight"><input id="button_diagram_id302" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id302');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id309" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html77.jpeg" usemap="#kiwi_46_html77" /><map name="kiwi_46_html77" id="kiwi_46_html77">
-                                 <area alt="kiwi0.tmp#id310" href="kiwi0.html#id310" coords="166,43,354,69" /></map></div>
+                           <div id="diagram_id302" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html7.jpeg" usemap="#kiwi_46_html7" /><map name="kiwi_46_html7" id="kiwi_46_html7">
+                                 <area alt="kiwi0.tmp#id303" href="kiwi0.html#id303" coords="166,43,354,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id309" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id302" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id309');"
+                                     onclick="switchState('properties_id302');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id309" style="display:block">
+                           <div id="properties_id302" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -16361,16 +15983,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id309" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id309');"
+                           <div class="floatRight"><input id="button_usedBy_id302" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id302');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id309" style="display:block">
+                           <div id="usedBy_id302" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packages</a></b></td>
                                  </tr>
                               </table>
@@ -16380,13 +16002,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id309" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id302" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id309');"
+                                     onclick="switchState('attributes_id302');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id309" style="display:block">
+                           <div id="attributes_id302" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -16399,7 +16021,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id312" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id305" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -16417,7 +16039,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -16441,12 +16063,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id309" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id309');"
+                           <div class="floatRight"><input id="button_source_id302" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id302');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id309" style="display:block">
+                           <div id="source_id302" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -16473,7 +16095,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id313"></a><div class="componentTitle">Element <span class="qname">rhelGroup</span></div>
+      </table><a id="id306"></a><div class="componentTitle">Element <span class="qname">rhelGroup</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -16492,13 +16114,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id313" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id306" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id313');"
+                                     onclick="switchState('annotations_id306');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id313" style="display:block">
+                           <div id="annotations_id306" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -16513,25 +16135,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id313" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id313');"
+                           <div class="floatRight"><input id="button_diagram_id306" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id306');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id313" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html33.jpeg" usemap="#kiwi_46_html33" /><map name="kiwi_46_html33" id="kiwi_46_html33">
-                                 <area alt="kiwi0.tmp#id314" href="kiwi0.html#id314" coords="131,43,282,69" /></map></div>
+                           <div id="diagram_id306" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html89.jpeg" usemap="#kiwi_46_html89" /><map name="kiwi_46_html89" id="kiwi_46_html89">
+                                 <area alt="kiwi0.tmp#id307" href="kiwi0.html#id307" coords="131,43,282,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id313" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id306" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id313');"
+                                     onclick="switchState('properties_id306');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id313" style="display:block">
+                           <div id="properties_id306" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -16546,16 +16168,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id313" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id313');"
+                           <div class="floatRight"><input id="button_usedBy_id306" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id306');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id313" style="display:block">
+                           <div id="usedBy_id306" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packages</a></b></td>
                                  </tr>
                               </table>
@@ -16565,13 +16187,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id313" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id306" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id313');"
+                                     onclick="switchState('attributes_id306');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id313" style="display:block">
+                           <div id="attributes_id306" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -16584,7 +16206,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id316" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id309" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -16602,7 +16224,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -16626,12 +16248,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id313" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id313');"
+                           <div class="floatRight"><input id="button_source_id306" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id306');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id313" style="display:block">
+                           <div id="source_id306" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -16658,7 +16280,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id317"></a><div class="componentTitle">Element <span class="qname">opensuseProduct</span></div>
+      </table><a id="id310"></a><div class="componentTitle">Element <span class="qname">opensuseProduct</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -16677,13 +16299,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id317" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id310" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id317');"
+                                     onclick="switchState('annotations_id310');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id317" style="display:block">
+                           <div id="annotations_id310" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -16698,25 +16320,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id317" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id317');"
+                           <div class="floatRight"><input id="button_diagram_id310" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id310');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id317" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html45.jpeg" usemap="#kiwi_46_html45" /><map name="kiwi_46_html45" id="kiwi_46_html45">
-                                 <area alt="kiwi0.tmp#id318" href="kiwi0.html#id318" coords="170,43,362,69" /></map></div>
+                           <div id="diagram_id310" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html51.jpeg" usemap="#kiwi_46_html51" /><map name="kiwi_46_html51" id="kiwi_46_html51">
+                                 <area alt="kiwi0.tmp#id311" href="kiwi0.html#id311" coords="170,43,362,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id317" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id310" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id317');"
+                                     onclick="switchState('properties_id310');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id317" style="display:block">
+                           <div id="properties_id310" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -16731,16 +16353,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id317" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id317');"
+                           <div class="floatRight"><input id="button_usedBy_id310" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id310');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id317" style="display:block">
+                           <div id="usedBy_id310" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packages</a></b></td>
                                  </tr>
                               </table>
@@ -16750,13 +16372,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id317" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id310" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id317');"
+                                     onclick="switchState('attributes_id310');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id317" style="display:block">
+                           <div id="attributes_id310" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -16769,7 +16391,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id320" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id313" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -16787,7 +16409,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -16811,12 +16433,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id317" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id317');"
+                           <div class="floatRight"><input id="button_source_id310" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id310');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id317" style="display:block">
+                           <div id="source_id310" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -16843,7 +16465,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id321"></a><div class="componentTitle">Element <span class="qname">ignore</span></div>
+      </table><a id="id314"></a><div class="componentTitle">Element <span class="qname">ignore</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -16862,13 +16484,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id321" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id314" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id321');"
+                                     onclick="switchState('annotations_id314');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id321" style="display:block">
+                           <div id="annotations_id314" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -16883,26 +16505,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id321" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id321');"
+                           <div class="floatRight"><input id="button_diagram_id314" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id314');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id321" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html136.jpeg"
-                                   usemap="#kiwi_46_html136" /><map name="kiwi_46_html136" id="kiwi_46_html136">
-                                 <area alt="kiwi0.tmp#id322" href="kiwi0.html#id322" coords="111,43,243,69" /></map></div>
+                           <div id="diagram_id314" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html60.jpeg" usemap="#kiwi_46_html60" /><map name="kiwi_46_html60" id="kiwi_46_html60">
+                                 <area alt="kiwi0.tmp#id315" href="kiwi0.html#id315" coords="111,43,243,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id321" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id314" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id321');"
+                                     onclick="switchState('properties_id314');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id321" style="display:block">
+                           <div id="properties_id314" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -16917,16 +16538,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id321" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id321');"
+                           <div class="floatRight"><input id="button_usedBy_id314" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id314');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id321" style="display:block">
+                           <div id="usedBy_id314" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packages</a></b></td>
                                  </tr>
                               </table>
@@ -16936,13 +16557,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id321" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id314" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id321');"
+                                     onclick="switchState('attributes_id314');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id321" style="display:block">
+                           <div id="attributes_id314" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -16955,7 +16576,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -16979,12 +16600,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id321" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id321');"
+                           <div class="floatRight"><input id="button_source_id314" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id314');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id321" style="display:block">
+                           <div id="source_id314" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -17011,7 +16632,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id324"></a><div class="componentTitle">Element <span class="qname">archive</span></div>
+      </table><a id="id317"></a><div class="componentTitle">Element <span class="qname">archive</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -17030,13 +16651,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id324" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id317" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id324');"
+                                     onclick="switchState('annotations_id317');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id324" style="display:block">
+                           <div id="annotations_id317" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -17051,26 +16672,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id324" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id324');"
+                           <div class="floatRight"><input id="button_diagram_id317" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id317');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id324" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html106.jpeg"
-                                   usemap="#kiwi_46_html106" /><map name="kiwi_46_html106" id="kiwi_46_html106">
-                                 <area alt="kiwi0.tmp#id325" href="kiwi0.html#id325" coords="115,43,251,69" /></map></div>
+                           <div id="diagram_id317" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html109.jpeg"
+                                   usemap="#kiwi_46_html109" /><map name="kiwi_46_html109" id="kiwi_46_html109">
+                                 <area alt="kiwi0.tmp#id318" href="kiwi0.html#id318" coords="115,43,251,69" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id324" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id317" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id324');"
+                                     onclick="switchState('properties_id317');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id324" style="display:block">
+                           <div id="properties_id317" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -17085,16 +16706,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id324" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id324');"
+                           <div class="floatRight"><input id="button_usedBy_id317" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id317');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id324" style="display:block">
+                           <div id="usedBy_id317" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packages</a></b></td>
                                  </tr>
                               </table>
@@ -17104,13 +16725,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id324" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id317" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id324');"
+                                     onclick="switchState('attributes_id317');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id324" style="display:block">
+                           <div id="attributes_id317" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -17123,7 +16744,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id327" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id320" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootinclude</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -17134,7 +16755,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -17158,12 +16779,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id324" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id324');"
+                           <div class="floatRight"><input id="button_source_id317" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id317');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id324" style="display:block">
+                           <div id="source_id317" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -17214,7 +16835,7 @@
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id2" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html15.jpeg" /></div>
+                           <div id="diagram_id2" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html199.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -17254,8 +16875,8 @@
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attributes </td>
-                                    <td><b><a href="kiwi0.html#id82" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.attlist/@size</a></b>, <b><a href="kiwi0.html#id346" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id85" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.attlist/@size</a></b>, <b><a href="kiwi0.html#id339" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.attribute/@size</a></b></td>
                                  </tr>
                               </table>
@@ -17318,7 +16939,7 @@
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id3" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html92.jpeg" /></div>
+                           <div id="diagram_id3" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html159.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -17358,10 +16979,10 @@
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attributes </td>
-                                    <td><b><a href="kiwi0.html#id44" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.attlist/@freespace</a></b>, <b><a href="kiwi0.html#id45" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.attlist/@size</a></b>, <b><a href="kiwi0.html#id439" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.freespace.attribute/@freespace</a></b>, <b><a href="kiwi0.html#id441" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id45" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.attlist/@freespace</a></b>, <b><a href="kiwi0.html#id46" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.attlist/@size</a></b>, <b><a href="kiwi0.html#id436" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.freespace.attribute/@freespace</a></b>, <b><a href="kiwi0.html#id438" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.size.attribute/@size</a></b></td>
                                  </tr>
                               </table>
@@ -17400,7 +17021,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id53"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-swap.content</span></div>
+      </table><a id="id4"></a><div class="componentTitle">Simple Type <span class="qname">image-name</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -17419,12 +17040,115 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id53" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id53');"
+                           <div class="floatRight"><input id="button_diagram_id4" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id4');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id53" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html98.jpeg" /></div>
+                           <div id="diagram_id4" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html12.jpeg" /></div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td>restriction of <b>xs:token</b></td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Facets</b></div>
+                           <div class="floatRight"><input id="button_facets_id4" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id4');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="facets_id4" style="display:block">
+                              <table class="facetsTable">
+                                 <tr>
+                                    <td class="firstColumn">pattern</td>
+                                    <td width="30%"><b>[^\s/]+</b></td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Used by</b></div>
+                           <div class="floatRight"><input id="button_usedBy_id4" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id4');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="usedBy_id4" style="display:block">
+                              <table class="usedByTable">
+                                 <tr>
+                                    <td class="firstColumn">Attribute </td>
+                                    <td><b><a href="kiwi0.html#id7" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.imagename.attribute/@name</a></b></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id4" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id4');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="source_id4" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
+                                 <tr>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:simpleType</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"image-name"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:pattern</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"[^\s/]+"</span><span class="tokenElement">/></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
+</span><span class="tokenElement"></xs:simpleType></span></pre></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id54"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-swap.content</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>No namespace</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Diagram</b></div>
+                           <div class="floatRight"><input id="button_diagram_id54" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id54');"
+                                     class="control" /></div>
+                        </td>
+                        <td class="diagram">
+                           <div id="diagram_id54" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html156.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -17434,16 +17158,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id53" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id53');"
+                           <div class="floatRight"><input id="button_usedBy_id54" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id54');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id53" style="display:block">
+                           <div id="usedBy_id54" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id52" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id53" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swap</a></b></td>
                                  </tr>
                               </table>
@@ -17453,12 +17177,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id53" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id53');"
+                           <div class="floatRight"><input id="button_source_id54" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id54');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id53" style="display:block">
+                           <div id="source_id54" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -17480,7 +17204,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id55"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-partition-install.content</span></div>
+      </table><a id="id56"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-partition-install.content</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -17499,12 +17223,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id55" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id55');"
+                           <div class="floatRight"><input id="button_diagram_id56" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id56');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id55" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html133.jpeg" /></div>
+                           <div id="diagram_id56" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html41.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -17514,16 +17238,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id55" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id55');"
+                           <div class="floatRight"><input id="button_usedBy_id56" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id56');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id55" style="display:block">
+                           <div id="usedBy_id56" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id54" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id55" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-partition-install</a></b></td>
                                  </tr>
                               </table>
@@ -17533,12 +17257,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id55" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id55');"
+                           <div class="floatRight"><input id="button_source_id56" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id56');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id55" style="display:block">
+                           <div id="source_id56" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -17560,7 +17284,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id57"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-home.content</span></div>
+      </table><a id="id58"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-home.content</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -17579,12 +17303,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id57" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id57');"
+                           <div class="floatRight"><input id="button_diagram_id58" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id58');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id57" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html246.jpeg" /></div>
+                           <div id="diagram_id58" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html49.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -17594,16 +17318,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id57" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id57');"
+                           <div class="floatRight"><input id="button_usedBy_id58" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id58');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id57" style="display:block">
+                           <div id="usedBy_id58" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id56" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id57" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-home</a></b></td>
                                  </tr>
                               </table>
@@ -17613,12 +17337,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id57" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id57');"
+                           <div class="floatRight"><input id="button_source_id58" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id58');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id57" style="display:block">
+                           <div id="source_id58" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -17640,7 +17364,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id60"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-kiwi-initrd.content</span></div>
+      </table><a id="id61"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-kiwi-initrd.content</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -17659,12 +17383,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id60" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id60');"
+                           <div class="floatRight"><input id="button_diagram_id61" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id61');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id60" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html289.jpeg" /></div>
+                           <div id="diagram_id61" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html149.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -17674,16 +17398,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id60" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id60');"
+                           <div class="floatRight"><input id="button_usedBy_id61" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id61');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id60" style="display:block">
+                           <div id="usedBy_id61" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id59" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id60" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-kiwi-initrd</a></b></td>
                                  </tr>
                               </table>
@@ -17693,12 +17417,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id60" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id60');"
+                           <div class="floatRight"><input id="button_source_id61" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id61');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id60" style="display:block">
+                           <div id="source_id61" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -17720,7 +17444,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id63"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-recovery.content</span></div>
+      </table><a id="id64"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-recovery.content</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -17739,12 +17463,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id63" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id63');"
+                           <div class="floatRight"><input id="button_diagram_id64" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id64');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id63" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html78.jpeg" /></div>
+                           <div id="diagram_id64" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html99.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -17754,16 +17478,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id63" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id63');"
+                           <div class="floatRight"><input id="button_usedBy_id64" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id64');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id63" style="display:block">
+                           <div id="usedBy_id64" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id62" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id63" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recovery</a></b></td>
                                  </tr>
                               </table>
@@ -17773,12 +17497,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id63" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id63');"
+                           <div class="floatRight"><input id="button_source_id64" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id64');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id63" style="display:block">
+                           <div id="source_id64" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -17800,7 +17524,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id66"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-reboot.content</span></div>
+      </table><a id="id67"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-inplace-recovery.content</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -17819,12 +17543,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id66" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id66');"
+                           <div class="floatRight"><input id="button_diagram_id67" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id67');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id66" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html267.jpeg" /></div>
+                           <div id="diagram_id67" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html14.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -17834,16 +17558,96 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id66" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id66');"
+                           <div class="floatRight"><input id="button_usedBy_id67" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id67');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id66" style="display:block">
+                           <div id="usedBy_id67" style="display:block">
+                              <table class="usedByTable">
+                                 <tr>
+                                    <td class="firstColumn">Element </td>
+                                    <td><b><a href="kiwi0.html#id66" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-inplace-recovery</a></b></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id67" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id67');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="source_id67" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
+                                 <tr>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:simpleType</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.oem-inplace-recovery.content"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">/></span><span class="tokenIndent">
+</span><span class="tokenElement"></xs:simpleType></span></pre></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id69"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-reboot.content</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>No namespace</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Diagram</b></div>
+                           <div class="floatRight"><input id="button_diagram_id69" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id69');"
+                                     class="control" /></div>
+                        </td>
+                        <td class="diagram">
+                           <div id="diagram_id69" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html256.jpeg" /></div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td><b>xs:boolean</b></td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Used by</b></div>
+                           <div class="floatRight"><input id="button_usedBy_id69" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id69');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="usedBy_id69" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id65" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id68" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-reboot</a></b></td>
                                  </tr>
                               </table>
@@ -17853,12 +17657,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id66" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id66');"
+                           <div class="floatRight"><input id="button_source_id69" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id69');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id66" style="display:block">
+                           <div id="source_id69" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -17880,7 +17684,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id68"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-dumphalt.content</span></div>
+      </table><a id="id71"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-dumphalt.content</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -17899,12 +17703,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id68" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id68');"
+                           <div class="floatRight"><input id="button_diagram_id71" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id71');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id68" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html79.jpeg" /></div>
+                           <div id="diagram_id71" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html126.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -17914,16 +17718,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id68" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id68');"
+                           <div class="floatRight"><input id="button_usedBy_id71" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id71');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id68" style="display:block">
+                           <div id="usedBy_id71" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id67" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id70" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-dumphalt</a></b></td>
                                  </tr>
                               </table>
@@ -17933,12 +17737,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id68" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id68');"
+                           <div class="floatRight"><input id="button_source_id71" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id71');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id68" style="display:block">
+                           <div id="source_id71" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -17960,7 +17764,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id70"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-unattended.content</span></div>
+      </table><a id="id73"></a><div class="componentTitle">Simple Type <span class="qname">k.oem-unattended.content</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -17979,12 +17783,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id70" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id70');"
+                           <div class="floatRight"><input id="button_diagram_id73" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id73');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id70" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html151.jpeg" /></div>
+                           <div id="diagram_id73" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html48.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -17994,16 +17798,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id70" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id70');"
+                           <div class="floatRight"><input id="button_usedBy_id73" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id73');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id70" style="display:block">
+                           <div id="usedBy_id73" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id69" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id72" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-unattended</a></b></td>
                                  </tr>
                               </table>
@@ -18013,12 +17817,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id70" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id70');"
+                           <div class="floatRight"><input id="button_source_id73" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id73');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id70" style="display:block">
+                           <div id="source_id73" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -18040,7 +17844,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id188"></a><div class="componentTitle">Simple Type <span class="qname">k.packagemanager.content</span></div>
+      </table><a id="id181"></a><div class="componentTitle">Simple Type <span class="qname">k.packagemanager.content</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -18059,12 +17863,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id188" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id188');"
+                           <div class="floatRight"><input id="button_diagram_id181" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id181');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id188" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html162.jpeg" /></div>
+                           <div id="diagram_id181" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html124.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -18074,12 +17878,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id188" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id188');"
+                           <div class="floatRight"><input id="button_facets_id181" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id181');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id188" style="display:block">
+                           <div id="facets_id181" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -18116,16 +17920,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id188" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id188');"
+                           <div class="floatRight"><input id="button_usedBy_id181" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id181');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id188" style="display:block">
+                           <div id="usedBy_id181" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id187" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id180" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packagemanager</a></b></td>
                                  </tr>
                               </table>
@@ -18135,12 +17939,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id188" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id188');"
+                           <div class="floatRight"><input id="button_source_id181" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id181');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id188" style="display:block">
+                           <div id="source_id181" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -18167,7 +17971,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id190"></a><div class="componentTitle">Simple Type <span class="qname">k.rpm-check-signatures.content</span></div>
+      </table><a id="id183"></a><div class="componentTitle">Simple Type <span class="qname">k.rpm-check-signatures.content</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -18186,12 +17990,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id190" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id190');"
+                           <div class="floatRight"><input id="button_diagram_id183" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id183');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id190" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html80.jpeg" /></div>
+                           <div id="diagram_id183" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html245.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -18201,16 +18005,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id190" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id190');"
+                           <div class="floatRight"><input id="button_usedBy_id183" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id183');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id190" style="display:block">
+                           <div id="usedBy_id183" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id189" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id182" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-check-signatures</a></b></td>
                                  </tr>
                               </table>
@@ -18220,12 +18024,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id190" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id190');"
+                           <div class="floatRight"><input id="button_source_id183" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id183');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id190" style="display:block">
+                           <div id="source_id183" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -18247,7 +18051,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id192"></a><div class="componentTitle">Simple Type <span class="qname">k.rpm-excludedocs.content</span></div>
+      </table><a id="id185"></a><div class="componentTitle">Simple Type <span class="qname">k.rpm-excludedocs.content</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -18266,12 +18070,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id192" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id192');"
+                           <div class="floatRight"><input id="button_diagram_id185" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id185');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id192" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html137.jpeg" /></div>
+                           <div id="diagram_id185" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html122.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -18281,16 +18085,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id192" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id192');"
+                           <div class="floatRight"><input id="button_usedBy_id185" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id185');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id192" style="display:block">
+                           <div id="usedBy_id185" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id191" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id184" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-excludedocs</a></b></td>
                                  </tr>
                               </table>
@@ -18300,12 +18104,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id192" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id192');"
+                           <div class="floatRight"><input id="button_source_id185" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id185');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id192" style="display:block">
+                           <div id="source_id185" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -18327,7 +18131,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id194"></a><div class="componentTitle">Simple Type <span class="qname">k.rpm-force.content</span></div>
+      </table><a id="id187"></a><div class="componentTitle">Simple Type <span class="qname">k.rpm-force.content</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -18346,12 +18150,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id194" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id194');"
+                           <div class="floatRight"><input id="button_diagram_id187" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id187');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id194" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html142.jpeg" /></div>
+                           <div id="diagram_id187" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html44.jpeg" /></div>
                         </td>
                      </tr>
                      <tr>
@@ -18361,16 +18165,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id194" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id194');"
+                           <div class="floatRight"><input id="button_usedBy_id187" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id187');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id194" style="display:block">
+                           <div id="usedBy_id187" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id193" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id186" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-force</a></b></td>
                                  </tr>
                               </table>
@@ -18380,12 +18184,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id194" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id194');"
+                           <div class="floatRight"><input id="button_source_id187" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id187');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id194" style="display:block">
+                           <div id="source_id187" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -18407,7 +18211,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id232"></a><div class="componentTitle">Complex Type <span class="qname">k.source</span></div>
+      </table><a id="id225"></a><div class="componentTitle">Complex Type <span class="qname">k.source</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -18426,29 +18230,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id232" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id232');"
+                           <div class="floatRight"><input id="button_diagram_id225" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id225');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id232" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html34.jpeg" usemap="#kiwi_46_html34" /><map name="kiwi_46_html34" id="kiwi_46_html34">
-                                 <area alt="kiwi0.tmp#id233" href="kiwi0.html#id233" coords="200,4,268,28" /></map></div>
+                           <div id="diagram_id225" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html185.jpeg"
+                                   usemap="#kiwi_46_html185" /><map name="kiwi_46_html185" id="kiwi_46_html185">
+                                 <area alt="kiwi0.tmp#id226" href="kiwi0.html#id226" coords="200,4,268,28" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id232" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id232');"
+                           <div class="floatRight"><input id="button_usedBy_id225" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id225');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id232" style="display:block">
+                           <div id="usedBy_id225" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Elements </td>
-                                    <td><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instrepo</a></b>, <b><a href="kiwi0.html#id293" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instrepo</a></b>, <b><a href="kiwi0.html#id286" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repository</a></b></td>
                                  </tr>
                               </table>
@@ -18457,23 +18262,23 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Model</b></td>
-                        <td><b><a href="kiwi0.html#id233" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Children</b></td>
-                        <td><b><a href="kiwi0.html#id233" target="mainFrame" title="No namespace"
+                        <td><b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
                                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id232" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id232');"
+                           <div class="floatRight"><input id="button_source_id225" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id225');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id232" style="display:block">
+                           <div id="source_id225" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -18497,8 +18302,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id6"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id5" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.name.attribute</a></b> / @name</span></div>
+      </table><a id="id7"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.imagename.attribute</a></b> / @name</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -18517,18 +18322,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id6" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id7" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id6');"
+                                     onclick="switchState('annotations_id7');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id6" style="display:block">
+                           <div id="annotations_id7" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">A name</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">An image name without / and spaces</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -18536,14 +18341,19 @@
                         </td>
                      </tr>
                      <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td><b><a href="kiwi0.html#id4" target="mainFrame" title="No namespace"
+                                 onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image-name</a></b></td>
+                     </tr>
+                     <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id6" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('properties_id6');"
+                           <div class="floatRight"><input id="button_properties_id7" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('properties_id7');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id6" style="display:block">
+                           <div id="properties_id7" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -18557,18 +18367,39 @@
                      </tr>
                      <tr>
                         <td class="firstColumn">
+                           <div class="floatLeft"><b>Facets</b></div>
+                           <div class="floatRight"><input id="button_facets_id7" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id7');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="facets_id7" style="display:block">
+                              <table class="facetsTable">
+                                 <tr>
+                                    <td class="firstColumn">pattern</td>
+                                    <td width="30%"><b>[^\s/]+</b></td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id6" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id6');"
+                           <div class="floatRight"><input id="button_usedBy_id7" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id7');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id6" style="display:block">
+                           <div id="usedBy_id7" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id5" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.name.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.imagename.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -18577,18 +18408,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id6" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id6');"
+                           <div class="floatRight"><input id="button_source_id7" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id7');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id6" style="display:block">
+                           <div id="source_id7" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"image-name"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">A name</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">An image name without / and spaces</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -18606,7 +18437,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id9"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id8" target="mainFrame" title="No namespace"
+      </table><a id="id10"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id9" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.displayname.attribute</a></b> / @displayname</span></div>
       <table class="rt">
          <tr>
@@ -18626,12 +18457,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id9" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('properties_id9');"
+                           <div class="floatRight"><input id="button_properties_id10" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('properties_id10');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id9" style="display:block">
+                           <div id="properties_id10" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -18646,16 +18478,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id9" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id9');"
+                           <div class="floatRight"><input id="button_usedBy_id10" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id10');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id9" style="display:block">
+                           <div id="usedBy_id10" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id8" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id9" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.displayname.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -18665,12 +18497,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id9" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id9');"
+                           <div class="floatRight"><input id="button_source_id10" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id10');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id9" style="display:block">
+                           <div id="source_id10" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -18690,7 +18522,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id15"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id14" target="mainFrame" title="No namespace"
+      </table><a id="id16"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id15" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.inherit.attribute</a></b> / @inherit</span></div>
       <table class="rt">
          <tr>
@@ -18710,13 +18542,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id15" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id16" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id15');"
+                                     onclick="switchState('properties_id16');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id15" style="display:block">
+                           <div id="properties_id16" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -18731,16 +18563,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id15" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id15');"
+                           <div class="floatRight"><input id="button_usedBy_id16" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id16');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id15" style="display:block">
+                           <div id="usedBy_id16" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id14" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id15" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.inherit.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -18750,12 +18582,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id15" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id15');"
+                           <div class="floatRight"><input id="button_source_id16" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id16');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id15" style="display:block">
+                           <div id="source_id16" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -18775,7 +18607,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id17"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id16" target="mainFrame" title="No namespace"
+      </table><a id="id18"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id17" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.schemaversion.attribute</a></b> / @schemaversion</span></div>
       <table class="rt">
          <tr>
@@ -18795,13 +18627,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id17" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id18" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id17');"
+                                     onclick="switchState('annotations_id18');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id17" style="display:block">
+                           <div id="annotations_id18" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -18820,13 +18652,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id17" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id18" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id17');"
+                                     onclick="switchState('properties_id18');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id17" style="display:block">
+                           <div id="properties_id18" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -18841,12 +18673,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id17" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id17');"
+                           <div class="floatRight"><input id="button_facets_id18" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id18');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id17" style="display:block">
+                           <div id="facets_id18" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -18862,16 +18694,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id17" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id17');"
+                           <div class="floatRight"><input id="button_usedBy_id18" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id18');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id17" style="display:block">
+                           <div id="usedBy_id18" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id16" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id17" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.schemaversion.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -18881,12 +18713,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id17" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id17');"
+                           <div class="floatRight"><input id="button_source_id18" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id18');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id17" style="display:block">
+                           <div id="source_id18" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -18915,7 +18747,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id19"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id18" target="mainFrame" title="No namespace"
+      </table><a id="id20"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id19" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.kiwirevision.attribute</a></b> / @kiwirevision</span></div>
       <table class="rt">
          <tr>
@@ -18939,13 +18771,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id19" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id20" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id19');"
+                                     onclick="switchState('properties_id20');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id19" style="display:block">
+                           <div id="properties_id20" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -18960,16 +18792,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id19" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id19');"
+                           <div class="floatRight"><input id="button_usedBy_id20" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id20');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id19" style="display:block">
+                           <div id="usedBy_id20" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id18" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id19" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.kiwirevision.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -18979,12 +18811,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id19" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id19');"
+                           <div class="floatRight"><input id="button_source_id20" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id20');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id19" style="display:block">
+                           <div id="source_id20" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -19004,7 +18836,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id21"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id20" target="mainFrame" title="No namespace"
+      </table><a id="id22"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id21" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.id</a></b> / @id</span></div>
       <table class="rt">
          <tr>
@@ -19028,13 +18860,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id21" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id22" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id21');"
+                                     onclick="switchState('properties_id22');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id21" style="display:block">
+                           <div id="properties_id22" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -19049,12 +18881,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id21" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id21');"
+                           <div class="floatRight"><input id="button_facets_id22" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id22');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id21" style="display:block">
+                           <div id="facets_id22" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">length</td>
@@ -19070,16 +18902,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id21" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id21');"
+                           <div class="floatRight"><input id="button_usedBy_id22" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id22');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id21" style="display:block">
+                           <div id="usedBy_id22" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id20" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id21" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.id</a></b></td>
                                  </tr>
                               </table>
@@ -19089,12 +18921,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id21" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id21');"
+                           <div class="floatRight"><input id="button_source_id22" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id22');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id21" style="display:block">
+                           <div id="source_id22" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -19120,7 +18952,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id23"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
+      </table><a id="id24"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b> / @displayname</span></div>
       <table class="rt">
          <tr>
@@ -19140,16 +18972,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id23" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id23');"
+                           <div class="floatRight"><input id="button_usedBy_id24" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id24');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id23" style="display:block">
+                           <div id="usedBy_id24" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -19159,12 +18991,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id23" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id23');"
+                           <div class="floatRight"><input id="button_source_id24" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id24');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id23" style="display:block">
+                           <div id="source_id24" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -19184,7 +19016,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id24"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
+      </table><a id="id25"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b> / @inherit</span></div>
       <table class="rt">
          <tr>
@@ -19204,16 +19036,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id24" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id24');"
+                           <div class="floatRight"><input id="button_usedBy_id25" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id25');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id24" style="display:block">
+                           <div id="usedBy_id25" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -19223,12 +19055,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id24" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id24');"
+                           <div class="floatRight"><input id="button_source_id25" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id25');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id24" style="display:block">
+                           <div id="source_id25" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -19248,7 +19080,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id25"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
+      </table><a id="id26"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b> / @kiwirevision</span></div>
       <table class="rt">
          <tr>
@@ -19272,13 +19104,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id25" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id26" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id25');"
+                                     onclick="switchState('properties_id26');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id25" style="display:block">
+                           <div id="properties_id26" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -19293,16 +19125,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id25" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id25');"
+                           <div class="floatRight"><input id="button_usedBy_id26" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id26');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id25" style="display:block">
+                           <div id="usedBy_id26" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -19312,12 +19144,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id25" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id25');"
+                           <div class="floatRight"><input id="button_source_id26" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id26');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id25" style="display:block">
+                           <div id="source_id26" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -19337,7 +19169,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id26"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
+      </table><a id="id27"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b> / @id</span></div>
       <table class="rt">
          <tr>
@@ -19361,13 +19193,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id26" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id27" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id26');"
+                                     onclick="switchState('properties_id27');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id26" style="display:block">
+                           <div id="properties_id27" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -19382,12 +19214,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id26" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id26');"
+                           <div class="floatRight"><input id="button_facets_id27" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id27');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id26" style="display:block">
+                           <div id="facets_id27" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">length</td>
@@ -19403,16 +19235,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id26" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id26');"
+                           <div class="floatRight"><input id="button_usedBy_id27" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id27');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id26" style="display:block">
+                           <div id="usedBy_id27" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -19422,12 +19254,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id26" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id26');"
+                           <div class="floatRight"><input id="button_source_id27" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id27');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id26" style="display:block">
+                           <div id="source_id27" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -19453,7 +19285,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id34"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id33" target="mainFrame" title="No namespace"
+      </table><a id="id35"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id34" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.type.attribute</a></b> / @type</span></div>
       <table class="rt">
          <tr>
@@ -19477,13 +19309,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id34" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id35" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id34');"
+                                     onclick="switchState('properties_id35');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id34" style="display:block">
+                           <div id="properties_id35" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -19498,12 +19330,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id34" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id34');"
+                           <div class="floatRight"><input id="button_facets_id35" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id35');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id34" style="display:block">
+                           <div id="facets_id35" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -19526,16 +19358,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id34" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id34');"
+                           <div class="floatRight"><input id="button_usedBy_id35" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id35');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id34" style="display:block">
+                           <div id="usedBy_id35" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id33" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id34" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.type.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -19545,12 +19377,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id34" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id34');"
+                           <div class="floatRight"><input id="button_source_id35" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id35');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id34" style="display:block">
+                           <div id="source_id35" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -19577,7 +19409,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id44"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
+      </table><a id="id45"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id44" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.attlist</a></b> / @freespace</span></div>
       <table class="rt">
          <tr>
@@ -19602,13 +19434,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id44" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id45" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id44');"
+                                     onclick="switchState('properties_id45');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id44" style="display:block">
+                           <div id="properties_id45" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -19623,12 +19455,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id44" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id44');"
+                           <div class="floatRight"><input id="button_facets_id45" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id45');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id44" style="display:block">
+                           <div id="facets_id45" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">pattern</td>
@@ -19644,16 +19476,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id44" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id44');"
+                           <div class="floatRight"><input id="button_usedBy_id45" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id45');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id44" style="display:block">
+                           <div id="usedBy_id45" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id44" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -19663,12 +19495,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id44" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id44');"
+                           <div class="floatRight"><input id="button_source_id45" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id45');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id44" style="display:block">
+                           <div id="source_id45" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -19688,7 +19520,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id45"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
+      </table><a id="id46"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id44" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.attlist</a></b> / @size</span></div>
       <table class="rt">
          <tr>
@@ -19713,13 +19545,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id45" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id46" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id45');"
+                                     onclick="switchState('properties_id46');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id45" style="display:block">
+                           <div id="properties_id46" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -19734,12 +19566,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id45" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id45');"
+                           <div class="floatRight"><input id="button_facets_id46" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id46');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id45" style="display:block">
+                           <div id="facets_id46" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">pattern</td>
@@ -19755,16 +19587,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id45" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id45');"
+                           <div class="floatRight"><input id="button_usedBy_id46" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id46');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id45" style="display:block">
+                           <div id="usedBy_id46" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id44" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -19774,12 +19606,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id45" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id45');"
+                           <div class="floatRight"><input id="button_source_id46" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id46');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id45" style="display:block">
+                           <div id="source_id46" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -19799,7 +19631,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id47"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id46" target="mainFrame" title="No namespace"
+      </table><a id="id48"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id47" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.name.attribute</a></b> / @name</span></div>
       <table class="rt">
          <tr>
@@ -19819,13 +19651,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id47" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id48" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id47');"
+                                     onclick="switchState('properties_id48');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id47" style="display:block">
+                           <div id="properties_id48" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -19840,16 +19672,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id47" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id47');"
+                           <div class="floatRight"><input id="button_usedBy_id48" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id48');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id47" style="display:block">
+                           <div id="usedBy_id48" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id46" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id47" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.name.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -19859,12 +19691,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id47" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id47');"
+                           <div class="floatRight"><input id="button_source_id48" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id48');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id47" style="display:block">
+                           <div id="source_id48" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -19884,7 +19716,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id49"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id48" target="mainFrame" title="No namespace"
+      </table><a id="id50"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id49" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.lvmvolumes.attlist</a></b> / @lvmgroup</span></div>
       <table class="rt">
          <tr>
@@ -19904,13 +19736,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id49" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id50" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id49');"
+                                     onclick="switchState('annotations_id50');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id49" style="display:block">
+                           <div id="annotations_id50" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -19925,16 +19757,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id49" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id49');"
+                           <div class="floatRight"><input id="button_usedBy_id50" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id50');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id49" style="display:block">
+                           <div id="usedBy_id50" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id48" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id49" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.lvmvolumes.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -19944,12 +19776,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id49" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id49');"
+                           <div class="floatRight"><input id="button_source_id50" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id50');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id49" style="display:block">
+                           <div id="source_id50" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -19973,7 +19805,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id79"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id78" target="mainFrame" title="No namespace"
+      </table><a id="id82"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id81" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.type.attribute</a></b> / @type</span></div>
       <table class="rt">
          <tr>
@@ -19993,13 +19825,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id79" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id82" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id79');"
+                                     onclick="switchState('annotations_id82');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id79" style="display:block">
+                           <div id="annotations_id82" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -20014,13 +19846,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id79" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id82" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id79');"
+                                     onclick="switchState('properties_id82');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id79" style="display:block">
+                           <div id="properties_id82" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -20035,16 +19867,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id79" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id79');"
+                           <div class="floatRight"><input id="button_usedBy_id82" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id82');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id79" style="display:block">
+                           <div id="usedBy_id82" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id78" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id81" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.type.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -20054,12 +19886,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id79" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id79');"
+                           <div class="floatRight"><input id="button_source_id82" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id82');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id79" style="display:block">
+                           <div id="source_id82" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -20083,7 +19915,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id81"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
+      </table><a id="id84"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id83" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.number.attribute</a></b> / @number</span></div>
       <table class="rt">
          <tr>
@@ -20103,13 +19935,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id81" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id84" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id81');"
+                                     onclick="switchState('annotations_id84');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id81" style="display:block">
+                           <div id="annotations_id84" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -20124,13 +19956,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id81" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id84" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id81');"
+                                     onclick="switchState('properties_id84');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id81" style="display:block">
+                           <div id="properties_id84" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -20145,16 +19977,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id81" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id81');"
+                           <div class="floatRight"><input id="button_usedBy_id84" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id84');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id81" style="display:block">
+                           <div id="usedBy_id84" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id83" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.number.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -20164,12 +19996,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id81" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id81');"
+                           <div class="floatRight"><input id="button_source_id84" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id84');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id81" style="display:block">
+                           <div id="source_id84" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -20193,7 +20025,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id82"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
+      </table><a id="id85"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.attlist</a></b> / @size</span></div>
       <table class="rt">
          <tr>
@@ -20213,13 +20045,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id82" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id85" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id82');"
+                                     onclick="switchState('annotations_id85');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id82" style="display:block">
+                           <div id="annotations_id85" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -20239,13 +20071,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id82" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id85" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id82');"
+                                     onclick="switchState('properties_id85');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id82" style="display:block">
+                           <div id="properties_id85" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -20260,12 +20092,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id82" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id82');"
+                           <div class="floatRight"><input id="button_facets_id85" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id85');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id82" style="display:block">
+                           <div id="facets_id85" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">pattern</td>
@@ -20281,16 +20113,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id82" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id82');"
+                           <div class="floatRight"><input id="button_usedBy_id85" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id85');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id82" style="display:block">
+                           <div id="usedBy_id85" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -20300,12 +20132,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id82" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id82');"
+                           <div class="floatRight"><input id="button_source_id85" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id85');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id82" style="display:block">
+                           <div id="source_id85" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -20329,7 +20161,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id83"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
+      </table><a id="id86"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.attlist</a></b> / @mountpoint</span></div>
       <table class="rt">
          <tr>
@@ -20349,13 +20181,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id83" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id86" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id83');"
+                                     onclick="switchState('annotations_id86');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id83" style="display:block">
+                           <div id="annotations_id86" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -20370,16 +20202,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id83" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id83');"
+                           <div class="floatRight"><input id="button_usedBy_id86" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id86');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id83" style="display:block">
+                           <div id="usedBy_id86" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -20389,12 +20221,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id83" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id83');"
+                           <div class="floatRight"><input id="button_source_id86" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id86');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id83" style="display:block">
+                           <div id="source_id86" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -20418,7 +20250,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id84"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
+      </table><a id="id87"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.attlist</a></b> / @target</span></div>
       <table class="rt">
          <tr>
@@ -20442,13 +20274,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id84" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id87" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id84');"
+                                     onclick="switchState('properties_id87');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id84" style="display:block">
+                           <div id="properties_id87" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -20463,16 +20295,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id84" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id84');"
+                           <div class="floatRight"><input id="button_usedBy_id87" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id87');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id84" style="display:block">
+                           <div id="usedBy_id87" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -20482,12 +20314,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id84" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id84');"
+                           <div class="floatRight"><input id="button_source_id87" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id87');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id84" style="display:block">
+                           <div id="source_id87" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -20507,7 +20339,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id86"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id85" target="mainFrame" title="No namespace"
+      </table><a id="id89"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id88" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partitions.attlist</a></b> / @device</span></div>
       <table class="rt">
          <tr>
@@ -20527,16 +20359,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id86" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id86');"
+                           <div class="floatRight"><input id="button_usedBy_id89" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id89');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id86" style="display:block">
+                           <div id="usedBy_id89" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id85" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id88" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partitions.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -20546,12 +20378,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id86" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id86');"
+                           <div class="floatRight"><input id="button_source_id89" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id89');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id86" style="display:block">
+                           <div id="source_id89" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -20571,7 +20403,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id90"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id89" target="mainFrame" title="No namespace"
+      </table><a id="id93"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id92" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.ro.attribute</a></b> / @ro</span></div>
       <table class="rt">
          <tr>
@@ -20591,13 +20423,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id90" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id93" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id90');"
+                                     onclick="switchState('annotations_id93');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id90" style="display:block">
+                           <div id="annotations_id93" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -20612,13 +20444,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id90" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id93" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id90');"
+                                     onclick="switchState('properties_id93');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id90" style="display:block">
+                           <div id="properties_id93" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -20633,16 +20465,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id90" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id90');"
+                           <div class="floatRight"><input id="button_usedBy_id93" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id93');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id90" style="display:block">
+                           <div id="usedBy_id93" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id89" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id92" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.ro.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -20652,12 +20484,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id90" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id90');"
+                           <div class="floatRight"><input id="button_source_id93" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id93');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id90" style="display:block">
+                           <div id="source_id93" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -20681,7 +20513,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id92"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id91" target="mainFrame" title="No namespace"
+      </table><a id="id95"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id94" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.rw.attribute</a></b> / @rw</span></div>
       <table class="rt">
          <tr>
@@ -20701,13 +20533,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id92" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id95" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id92');"
+                                     onclick="switchState('annotations_id95');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id92" style="display:block">
+                           <div id="annotations_id95" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -20722,13 +20554,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id92" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id95" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id92');"
+                                     onclick="switchState('properties_id95');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id92" style="display:block">
+                           <div id="properties_id95" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -20743,16 +20575,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id92" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id92');"
+                           <div class="floatRight"><input id="button_usedBy_id95" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id95');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id92" style="display:block">
+                           <div id="usedBy_id95" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id91" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id94" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.rw.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -20762,12 +20594,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id92" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id92');"
+                           <div class="floatRight"><input id="button_source_id95" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id95');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id92" style="display:block">
+                           <div id="source_id95" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -20791,7 +20623,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id94"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id93" target="mainFrame" title="No namespace"
+      </table><a id="id97"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id96" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.type.attribute</a></b> / @type</span></div>
       <table class="rt">
          <tr>
@@ -20815,13 +20647,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id94" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id97" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id94');"
+                                     onclick="switchState('properties_id97');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id94" style="display:block">
+                           <div id="properties_id97" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -20836,12 +20668,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id94" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id94');"
+                           <div class="floatRight"><input id="button_facets_id97" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id97');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id94" style="display:block">
+                           <div id="facets_id97" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -20871,16 +20703,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id94" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id94');"
+                           <div class="floatRight"><input id="button_usedBy_id97" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id97');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id94" style="display:block">
+                           <div id="usedBy_id97" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id93" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id96" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.type.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -20890,12 +20722,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id94" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id94');"
+                           <div class="floatRight"><input id="button_source_id97" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id97');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id94" style="display:block">
+                           <div id="source_id97" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -20923,7 +20755,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id99"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id98" target="mainFrame" title="No namespace"
+      </table><a id="id102"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id101" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source.attribute</a></b> / @source</span></div>
       <table class="rt">
          <tr>
@@ -20943,13 +20775,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id99" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id102" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id99');"
+                                     onclick="switchState('properties_id102');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id99" style="display:block">
+                           <div id="properties_id102" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -20964,16 +20796,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id99" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id99');"
+                           <div class="floatRight"><input id="button_usedBy_id102" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id102');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id99" style="display:block">
+                           <div id="usedBy_id102" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id98" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id101" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -20983,12 +20815,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id99" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id99');"
+                           <div class="floatRight"><input id="button_source_id102" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id102');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id99" style="display:block">
+                           <div id="source_id102" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -21008,7 +20840,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id102"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id101" target="mainFrame" title="No namespace"
+      </table><a id="id105"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id104" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.dest.attribute</a></b> / @dest</span></div>
       <table class="rt">
          <tr>
@@ -21028,13 +20860,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id102" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id105" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id102');"
+                                     onclick="switchState('annotations_id105');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id102" style="display:block">
+                           <div id="annotations_id105" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -21049,13 +20881,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id102" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id105" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id102');"
+                                     onclick="switchState('properties_id105');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id102" style="display:block">
+                           <div id="properties_id105" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -21070,16 +20902,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id102" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id102');"
+                           <div class="floatRight"><input id="button_usedBy_id105" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id105');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id102" style="display:block">
+                           <div id="usedBy_id105" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id101" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id104" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.dest.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -21089,12 +20921,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id102" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id102');"
+                           <div class="floatRight"><input id="button_source_id105" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id105');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id102" style="display:block">
+                           <div id="source_id105" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -21118,7 +20950,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id103"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id96" target="mainFrame" title="No namespace"
+      </table><a id="id106"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id99" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.attlist</a></b> / @arch</span></div>
       <table class="rt">
          <tr>
@@ -21138,13 +20970,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id103" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id106" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id103');"
+                                     onclick="switchState('annotations_id106');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id103" style="display:block">
+                           <div id="annotations_id106" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -21159,16 +20991,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id103" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id103');"
+                           <div class="floatRight"><input id="button_usedBy_id106" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id106');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id103" style="display:block">
+                           <div id="usedBy_id106" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id96" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id99" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -21178,12 +21010,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id103" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id103');"
+                           <div class="floatRight"><input id="button_source_id106" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id106');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id103" style="display:block">
+                           <div id="source_id106" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -21207,7 +21039,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id105"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id104" target="mainFrame" title="No namespace"
+      </table><a id="id108"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id107" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.attlist</a></b> / @server</span></div>
       <table class="rt">
          <tr>
@@ -21227,13 +21059,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id105" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id108" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id105');"
+                                     onclick="switchState('annotations_id108');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id105" style="display:block">
+                           <div id="annotations_id108" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -21248,16 +21080,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id105" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id105');"
+                           <div class="floatRight"><input id="button_usedBy_id108" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id108');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id105" style="display:block">
+                           <div id="usedBy_id108" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id104" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id107" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -21267,12 +21099,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id105" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id105');"
+                           <div class="floatRight"><input id="button_source_id108" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id108');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id105" style="display:block">
+                           <div id="source_id108" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -21296,7 +21128,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id106"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id104" target="mainFrame" title="No namespace"
+      </table><a id="id109"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id107" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.attlist</a></b> / @blocksize</span></div>
       <table class="rt">
          <tr>
@@ -21316,13 +21148,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id106" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id109" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id106');"
+                                     onclick="switchState('annotations_id109');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id106" style="display:block">
+                           <div id="annotations_id109" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -21341,13 +21173,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id106" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id109" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id106');"
+                                     onclick="switchState('properties_id109');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id106" style="display:block">
+                           <div id="properties_id109" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -21362,16 +21194,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id106" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id106');"
+                           <div class="floatRight"><input id="button_usedBy_id109" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id109');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id106" style="display:block">
+                           <div id="usedBy_id109" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id104" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id107" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -21381,12 +21213,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id106" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id106');"
+                           <div class="floatRight"><input id="button_source_id109" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id109');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id106" style="display:block">
+                           <div id="source_id109" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -21410,7 +21242,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id109"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id108" target="mainFrame" title="No namespace"
+      </table><a id="id112"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.attlist</a></b> / @unit</span></div>
       <table class="rt">
          <tr>
@@ -21430,13 +21262,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id109" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id112" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id109');"
+                                     onclick="switchState('annotations_id112');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id109" style="display:block">
+                           <div id="annotations_id112" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -21455,13 +21287,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id109" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id112" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id109');"
+                                     onclick="switchState('properties_id112');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id109" style="display:block">
+                           <div id="properties_id112" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -21476,12 +21308,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id109" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id109');"
+                           <div class="floatRight"><input id="button_facets_id112" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id112');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id109" style="display:block">
+                           <div id="facets_id112" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -21504,16 +21336,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id109" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id109');"
+                           <div class="floatRight"><input id="button_usedBy_id112" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id112');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id109" style="display:block">
+                           <div id="usedBy_id112" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id108" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -21523,12 +21355,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id109" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id109');"
+                           <div class="floatRight"><input id="button_source_id112" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id112');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id109" style="display:block">
+                           <div id="source_id112" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -21558,7 +21390,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id110"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id108" target="mainFrame" title="No namespace"
+      </table><a id="id113"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.attlist</a></b> / @additive</span></div>
       <table class="rt">
          <tr>
@@ -21582,13 +21414,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id110" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id113" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id110');"
+                                     onclick="switchState('properties_id113');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id110" style="display:block">
+                           <div id="properties_id113" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -21603,16 +21435,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id110" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id110');"
+                           <div class="floatRight"><input id="button_usedBy_id113" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id113');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id110" style="display:block">
+                           <div id="usedBy_id113" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id108" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -21622,12 +21454,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id110" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id110');"
+                           <div class="floatRight"><input id="button_source_id113" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id113');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id110" style="display:block">
+                           <div id="source_id113" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -21647,8 +21479,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id119"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id117" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.attlist</a></b> / @arch</span></div>
+      </table><a id="id120"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id119" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.name.attribute</a></b> / @name</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -21667,18 +21499,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id119" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id120" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id119');"
+                                     onclick="switchState('annotations_id120');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id119" style="display:block">
+                           <div id="annotations_id120" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">An architecture</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">A name</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -21687,18 +21519,39 @@
                      </tr>
                      <tr>
                         <td class="firstColumn">
+                           <div class="floatLeft"><b>Properties</b></div>
+                           <div class="floatRight"><input id="button_properties_id120" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('properties_id120');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="properties_id120" style="display:block">
+                              <table class="propertiesTable">
+                                 <tr>
+                                    <td class="firstColumn">use:
+                                       
+                                    </td>
+                                    <td><b>required</b></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id119" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id119');"
+                           <div class="floatRight"><input id="button_usedBy_id120" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id120');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id119" style="display:block">
+                           <div id="usedBy_id120" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id117" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.attlist</a></b></td>
+                                    <td><b><a href="kiwi0.html#id119" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.name.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -21707,18 +21560,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id119" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id119');"
+                           <div class="floatRight"><input id="button_source_id120" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id120');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id119" style="display:block">
+                           <div id="source_id120" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"arch"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">An architecture</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">A name</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -21736,8 +21589,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id125"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id124" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.driver.attribute</a></b> / @driver</span></div>
+      </table><a id="id124"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id122" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.attlist</a></b> / @arch</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -21756,18 +21609,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id125" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id124" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id125');"
+                                     onclick="switchState('annotations_id124');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id125" style="display:block">
+                           <div id="annotations_id124" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The driver used for the VM network interface</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">An architecture</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -21776,39 +21629,18 @@
                      </tr>
                      <tr>
                         <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id125" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id125');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id125" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id125" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id125');"
+                           <div class="floatRight"><input id="button_usedBy_id124" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id124');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id125" style="display:block">
+                           <div id="usedBy_id124" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id124" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.driver.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id122" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -21817,18 +21649,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id125" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id125');"
+                           <div class="floatRight"><input id="button_source_id124" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id124');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id125" style="display:block">
+                           <div id="source_id124" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"driver"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"arch"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The driver used for the VM network interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">An architecture</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -21846,8 +21678,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id127"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.interface.attribute</a></b> / @interface</span></div>
+      </table><a id="id129"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id128" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.attlist</a></b> / @driver</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -21866,18 +21698,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id127" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id129" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id127');"
+                                     onclick="switchState('annotations_id129');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id127" style="display:block">
+                           <div id="annotations_id129" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The interface ID for the VM network interface</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The driver used for the VM network interface</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -21885,44 +21717,19 @@
                         </td>
                      </tr>
                      <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:nonNegativeInteger</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id127" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id127');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id127" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id127" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id127');"
+                           <div class="floatRight"><input id="button_usedBy_id129" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id129');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id127" style="display:block">
+                           <div id="usedBy_id129" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.interface.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id128" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -21931,18 +21738,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id127" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id127');"
+                           <div class="floatRight"><input id="button_source_id129" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id129');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id127" style="display:block">
+                           <div id="source_id129" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"interface"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:nonNegativeInteger"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"driver"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The interface ID for the VM network interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The driver used for the VM network interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -21960,8 +21767,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id129"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id128" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.mode.attribute</a></b> / @mode</span></div>
+      </table><a id="id131"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id130" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.interface.attribute</a></b> / @interface</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -21980,18 +21787,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id129" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id131" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id129');"
+                                     onclick="switchState('annotations_id131');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id129" style="display:block">
+                           <div id="annotations_id131" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The VM network mode</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The interface ID for the VM network interface</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -22001,13 +21808,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id129" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id131" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id129');"
+                                     onclick="switchState('properties_id131');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id129" style="display:block">
+                           <div id="properties_id131" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -22022,17 +21829,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id129" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id129');"
+                           <div class="floatRight"><input id="button_usedBy_id131" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id131');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id129" style="display:block">
+                           <div id="usedBy_id131" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id128" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.mode.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id130" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.interface.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -22041,18 +21848,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id129" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id129');"
+                           <div class="floatRight"><input id="button_source_id131" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id131');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id129" style="display:block">
+                           <div id="source_id131" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mode"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"interface"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VM network mode</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The interface ID for the VM network interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -22070,8 +21877,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id133"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id132" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.controller.attribute</a></b> / @controller</span></div>
+      </table><a id="id132"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id128" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.attlist</a></b> / @mode</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -22090,18 +21897,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id133" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id132" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id133');"
+                                     onclick="switchState('annotations_id132');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id133" style="display:block">
+                           <div id="annotations_id132" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The disk controller used for the VMware guest</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The VM network mode</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -22109,72 +21916,19 @@
                         </td>
                      </tr>
                      <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td>restriction of <b>xs:token</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id133" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id133');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id133" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id133" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id133');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="facets_id133" style="display:block">
-                              <table class="facetsTable">
-                                 <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>ide</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>scsi</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id133" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id133');"
+                           <div class="floatRight"><input id="button_usedBy_id132" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id132');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id133" style="display:block">
+                           <div id="usedBy_id132" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id132" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.controller.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id128" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -22183,25 +21937,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id133" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id133');"
+                           <div class="floatRight"><input id="button_source_id132" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id132');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id133" style="display:block">
+                           <div id="source_id132" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"controller"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mode"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk controller used for the VMware guest</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VM network mode</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ide"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"scsi"</span><span class="tokenElement">/></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
                               </table>
@@ -22218,8 +21966,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id135"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id134" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.id.attribute</a></b> / @id</span></div>
+      </table><a id="id133"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id128" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.attlist</a></b> / @mac</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -22238,18 +21986,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id135" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id133" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id135');"
+                                     onclick="switchState('annotations_id133');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id135" style="display:block">
+                           <div id="annotations_id133" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The disk ID for the VM disk</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The VM mac address</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -22257,44 +22005,19 @@
                         </td>
                      </tr>
                      <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:nonNegativeInteger</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id135" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id135');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id135" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id135" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id135');"
+                           <div class="floatRight"><input id="button_usedBy_id133" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id133');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id135" style="display:block">
+                           <div id="usedBy_id133" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id134" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.id.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id128" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -22303,18 +22026,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id135" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id135');"
+                           <div class="floatRight"><input id="button_source_id133" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id133');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id135" style="display:block">
+                           <div id="source_id133" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"id"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:nonNegativeInteger"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mac"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk ID for the VM disk</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VM mac address</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -22332,8 +22055,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id139"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id138" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.controller.attribute</a></b> / @controller</span></div>
+      </table><a id="id137"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id136" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.controller.attribute</a></b> / @controller</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -22352,18 +22075,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id139" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id137" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id139');"
+                                     onclick="switchState('annotations_id137');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id139" style="display:block">
+                           <div id="annotations_id137" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The CD/DVD controller used for the VMware guest</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The disk controller used for the VM guest</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -22377,13 +22100,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id139" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id137" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id139');"
+                                     onclick="switchState('properties_id137');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id139" style="display:block">
+                           <div id="properties_id137" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -22398,12 +22121,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id139" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id139');"
+                           <div class="floatRight"><input id="button_facets_id137" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id137');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id139" style="display:block">
+                           <div id="facets_id137" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -22426,17 +22149,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id139" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id139');"
+                           <div class="floatRight"><input id="button_usedBy_id137" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id137');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id139" style="display:block">
+                           <div id="usedBy_id137" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id138" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.controller.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id136" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.controller.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -22445,18 +22168,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id139" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id139');"
+                           <div class="floatRight"><input id="button_source_id137" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id137');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id139" style="display:block">
+                           <div id="source_id137" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
                                     <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"controller"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The CD/DVD controller used for the VMware guest</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk controller used for the VM guest</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
@@ -22480,8 +22203,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id141"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id140" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.id.attribute</a></b> / @id</span></div>
+      </table><a id="id139"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id138" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.id.attribute</a></b> / @id</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -22500,18 +22223,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id141" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id139" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id141');"
+                                     onclick="switchState('annotations_id139');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id141" style="display:block">
+                           <div id="annotations_id139" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The CD/DVD ID for the VM CD rom drive</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The disk ID / device for the VM disk</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -22525,13 +22248,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id141" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id139" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id141');"
+                                     onclick="switchState('properties_id139');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id141" style="display:block">
+                           <div id="properties_id139" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -22546,17 +22269,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id141" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id141');"
+                           <div class="floatRight"><input id="button_usedBy_id139" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id139');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id141" style="display:block">
+                           <div id="usedBy_id139" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id140" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.id.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id138" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.id.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -22565,18 +22288,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id141" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id141');"
+                           <div class="floatRight"><input id="button_source_id139" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id139');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id141" style="display:block">
+                           <div id="source_id139" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
                                     <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"id"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:nonNegativeInteger"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The CD/DVD ID for the VM CD rom drive</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk ID / device for the VM disk</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -22594,8 +22317,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id143"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id142" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.attlist</a></b> / @arch</span></div>
+      </table><a id="id140"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id135" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.attlist</a></b> / @device</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -22614,18 +22337,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id143" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id140" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id143');"
+                                     onclick="switchState('annotations_id140');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id143" style="display:block">
+                           <div id="annotations_id140" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">the VMware architecture type</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The disk device to appear in the guest (xen only)</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -22633,79 +22356,19 @@
                         </td>
                      </tr>
                      <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td>restriction of <b>xs:token</b></td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id143" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id143');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id143" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">content:
-                                       
-                                    </td>
-                                    <td><b>simple</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id143" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id143');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="facets_id143" style="display:block">
-                              <table class="facetsTable">
-                                 <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>ix86</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>x86_64</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>%arch</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id143" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id143');"
+                           <div class="floatRight"><input id="button_usedBy_id140" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id140');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id143" style="display:block">
+                           <div id="usedBy_id140" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id142" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.attlist</a></b></td>
+                                    <td><b><a href="kiwi0.html#id135" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -22714,26 +22377,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id143" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id143');"
+                           <div class="floatRight"><input id="button_source_id140" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id140');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id143" style="display:block">
+                           <div id="source_id140" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"arch"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"device"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the VMware architecture type</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk device to appear in the guest (xen only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ix86"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"x86_64"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"%arch"</span><span class="tokenElement">/></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
                               </table>
@@ -22750,8 +22406,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id144"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id142" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.attlist</a></b> / @HWversion</span></div>
+      </table><a id="id144"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id143" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.controller.attribute</a></b> / @controller</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -22781,7 +22437,7 @@
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The virtual HW version number for the VMware configuration</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The CD/DVD controller used for the VM guest</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -22790,7 +22446,7 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:integer</b></td>
+                        <td>restriction of <b>xs:token</b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
@@ -22804,10 +22460,10 @@
                            <div id="properties_id144" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
-                                    <td class="firstColumn">content:
+                                    <td class="firstColumn">use:
                                        
                                     </td>
-                                    <td><b>simple</b></td>
+                                    <td><b>required</b></td>
                                  </tr>
                               </table>
                            </div>
@@ -22815,107 +22471,46 @@
                      </tr>
                      <tr>
                         <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id144" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id144');"
+                           <div class="floatLeft"><b>Facets</b></div>
+                           <div class="floatRight"><input id="button_facets_id144" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id144');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id144" style="display:block">
-                              <table class="usedByTable">
+                           <div id="facets_id144" style="display:block">
+                              <table class="facetsTable">
                                  <tr>
-                                    <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id142" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.attlist</a></b></td>
+                                    <td class="firstColumn">enumeration</td>
+                                    <td width="30%"><b>ide</b></td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
                                  </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id144" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id144');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id144" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"HWversion"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The virtual HW version number for the VMware configuration</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-</span><span class="tokenElement"></xs:attribute></span></pre></td>
+                                    <td class="firstColumn">enumeration</td>
+                                    <td width="30%"><b>scsi</b></td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
                                  </tr>
                               </table>
                            </div>
                         </td>
                      </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id145"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id142" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.attlist</a></b> / @guestOS</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id145" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('annotations_id145');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="annotations_id145" style="display:block">
-                              <div class="annotation">
-                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                        class="preWrapContainer">
-                                    <tr>
-                                       <td width="100%"><pre><span class="tokenText">the virtual guestOS identification string for VMware</span></pre></td>
-                                    </tr>
-                                 </table>
-                              </div>
-                           </div>
-                        </td>
-                     </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id145" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id145');"
+                           <div class="floatRight"><input id="button_usedBy_id144" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id144');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id145" style="display:block">
+                           <div id="usedBy_id144" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id142" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.attlist</a></b></td>
+                                    <td><b><a href="kiwi0.html#id143" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.controller.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -22924,19 +22519,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id145" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id145');"
+                           <div class="floatRight"><input id="button_source_id144" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id144');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id145" style="display:block">
+                           <div id="source_id144" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"guestOS"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"controller"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the virtual guestOS identification string for VMware</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The CD/DVD controller used for the VM guest</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ide"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"scsi"</span><span class="tokenElement">/></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
                               </table>
@@ -22953,8 +22554,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id146"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id142" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.attlist</a></b> / @usb</span></div>
+      </table><a id="id146"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id145" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.id.attribute</a></b> / @id</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -22984,7 +22585,7 @@
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">Activate/Deactivate usb controller for VMware</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The CD/DVD ID for the VM CD rom drive</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -22993,7 +22594,7 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:boolean</b></td>
+                        <td><b>xs:nonNegativeInteger</b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
@@ -23007,10 +22608,10 @@
                            <div id="properties_id146" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
-                                    <td class="firstColumn">content:
+                                    <td class="firstColumn">use:
                                        
                                     </td>
-                                    <td><b>simple</b></td>
+                                    <td><b>required</b></td>
                                  </tr>
                               </table>
                            </div>
@@ -23028,8 +22629,8 @@
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id142" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.attlist</a></b></td>
+                                    <td><b><a href="kiwi0.html#id145" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.id.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -23047,9 +22648,9 @@
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"usb"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"id"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:nonNegativeInteger"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Activate/Deactivate usb controller for VMware</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The CD/DVD ID for the VM CD rom drive</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -23068,7 +22669,7 @@
             <td class="rt_cornerBottomRight"></td>
          </tr>
       </table><a id="id148"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.memory.attribute</a></b> / @memory</span></div>
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.attlist</a></b> / @arch</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -23098,7 +22699,7 @@
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The memory setup for the guest VM.</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">the VM architecture type</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -23106,6 +22707,10 @@
                         </td>
                      </tr>
                      <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td>restriction of <b>xs:token</b></td>
+                     </tr>
+                     <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
                            <div class="floatRight"><input id="button_properties_id148" type="image" src="images/button_minus.gif"
@@ -23117,10 +22722,45 @@
                            <div id="properties_id148" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
-                                    <td class="firstColumn">use:
+                                    <td class="firstColumn">content:
                                        
                                     </td>
-                                    <td><b>required</b></td>
+                                    <td><b>simple</b></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Facets</b></div>
+                           <div class="floatRight"><input id="button_facets_id148" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id148');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="facets_id148" style="display:block">
+                              <table class="facetsTable">
+                                 <tr>
+                                    <td class="firstColumn">enumeration</td>
+                                    <td width="30%"><b>ix86</b></td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="firstColumn">enumeration</td>
+                                    <td width="30%"><b>x86_64</b></td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="firstColumn">enumeration</td>
+                                    <td width="30%"><b>%arch</b></td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
                                  </tr>
                               </table>
                            </div>
@@ -23139,7 +22779,7 @@
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
                                     <td><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.memory.attribute</a></b></td>
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -23157,10 +22797,17 @@
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"memory"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"arch"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The memory setup for the guest VM.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the VM architecture type</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ix86"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"x86_64"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"%arch"</span><span class="tokenElement">/></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
                               </table>
@@ -23177,8 +22824,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id153"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id152" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xendisk.device.attribute</a></b> / @device</span></div>
+      </table><a id="id149"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.attlist</a></b> / @HWversion</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -23197,18 +22844,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id153" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id149" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id153');"
+                                     onclick="switchState('annotations_id149');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id153" style="display:block">
+                           <div id="annotations_id149" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The disk device to appear in the Xen guest</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The virtual HW version number for the VM configuration</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -23216,21 +22863,25 @@
                         </td>
                      </tr>
                      <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td><b>xs:integer</b></td>
+                     </tr>
+                     <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id153" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id149" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id153');"
+                                     onclick="switchState('properties_id149');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id153" style="display:block">
+                           <div id="properties_id149" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
-                                    <td class="firstColumn">use:
+                                    <td class="firstColumn">content:
                                        
                                     </td>
-                                    <td><b>required</b></td>
+                                    <td><b>simple</b></td>
                                  </tr>
                               </table>
                            </div>
@@ -23239,17 +22890,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id153" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id153');"
+                           <div class="floatRight"><input id="button_usedBy_id149" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id149');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id153" style="display:block">
+                           <div id="usedBy_id149" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id152" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xendisk.device.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -23258,18 +22909,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id153" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id153');"
+                           <div class="floatRight"><input id="button_source_id149" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id149');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id153" style="display:block">
+                           <div id="source_id149" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"device"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"HWversion"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk device to appear in the Xen guest</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The virtual HW version number for the VM configuration</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -23287,8 +22938,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id156"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id155" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.attlist</a></b> / @mac</span></div>
+      </table><a id="id150"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.attlist</a></b> / @guestOS</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -23307,18 +22958,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id156" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id150" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id156');"
+                                     onclick="switchState('annotations_id150');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id156" style="display:block">
+                           <div id="annotations_id150" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The Mac address to assign to the virtual interface</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">the virtual guestOS identification string for the VM</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -23328,127 +22979,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id156" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id156');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id156" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id155" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.attlist</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id156" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id156');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id156" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mac"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The Mac address to assign to the virtual interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-</span><span class="tokenElement"></xs:attribute></span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id158"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id157" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.name.attribute</a></b> / @name</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id158" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('annotations_id158');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="annotations_id158" style="display:block">
-                              <div class="annotation">
-                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                        class="preWrapContainer">
-                                    <tr>
-                                       <td width="100%"><pre><span class="tokenText">The Xen bridged interface name</span></pre></td>
-                                    </tr>
-                                 </table>
-                              </div>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id158" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('properties_id158');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="properties_id158" style="display:block">
-                              <table class="propertiesTable">
-                                 <tr>
-                                    <td class="firstColumn">use:
-                                       
-                                    </td>
-                                    <td><b>required</b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id158" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id158');"
+                           <div class="floatRight"><input id="button_usedBy_id150" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id150');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id158" style="display:block">
+                           <div id="usedBy_id150" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id157" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.name.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -23457,18 +22998,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id158" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id158');"
+                           <div class="floatRight"><input id="button_source_id150" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id150');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id158" style="display:block">
+                           <div id="source_id150" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"guestOS"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The Xen bridged interface name</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the virtual guestOS identification string for the VM</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -23486,8 +23027,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id160"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id159" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.attlist</a></b> / @memory</span></div>
+      </table><a id="id151"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.attlist</a></b> / @memory</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -23506,18 +23047,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id160" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id151" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id160');"
+                                     onclick="switchState('annotations_id151');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id160" style="display:block">
+                           <div id="annotations_id151" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The memory setup for the Xen guest.</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The memory setup for the guest VM.</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -23527,17 +23068,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id160" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id160');"
+                           <div class="floatRight"><input id="button_usedBy_id151" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id151');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id160" style="display:block">
+                           <div id="usedBy_id151" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id159" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.attlist</a></b></td>
+                                    <td><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -23546,18 +23087,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id160" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id160');"
+                           <div class="floatRight"><input id="button_source_id151" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id151');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id160" style="display:block">
+                           <div id="source_id151" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
                                     <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"memory"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The memory setup for the Xen guest.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The memory setup for the guest VM.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -23575,8 +23116,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id161"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id159" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.attlist</a></b> / @domain</span></div>
+      </table><a id="id152"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.attlist</a></b> / @domain</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -23595,18 +23136,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id161" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id152" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id161');"
+                                     onclick="switchState('annotations_id152');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id161" style="display:block">
+                           <div id="annotations_id152" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The type of Xen domain to create (dom0 or domU)</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The domain setup for the VM (xen only)</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -23620,13 +23161,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id161" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id152" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id161');"
+                                     onclick="switchState('properties_id152');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id161" style="display:block">
+                           <div id="properties_id152" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -23641,12 +23182,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id161" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id161');"
+                           <div class="floatRight"><input id="button_facets_id152" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id152');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id161" style="display:block">
+                           <div id="facets_id152" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -23669,17 +23210,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id161" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id161');"
+                           <div class="floatRight"><input id="button_usedBy_id152" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id152');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id161" style="display:block">
+                           <div id="usedBy_id152" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id159" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.attlist</a></b></td>
+                                    <td><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -23688,18 +23229,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id161" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id161');"
+                           <div class="floatRight"><input id="button_source_id152" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id152');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id161" style="display:block">
+                           <div id="source_id152" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
                                     <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"domain"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The type of Xen domain to create (dom0 or domU)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The domain setup for the VM (xen only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
@@ -23723,7 +23264,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id164"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id163" target="mainFrame" title="No namespace"
+      </table><a id="id155"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id154" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.image.attribute</a></b> / @image</span></div>
       <table class="rt">
          <tr>
@@ -23743,13 +23284,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id164" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id155" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id164');"
+                                     onclick="switchState('annotations_id155');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id164" style="display:block">
+                           <div id="annotations_id155" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -23768,13 +23309,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id164" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id155" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id164');"
+                                     onclick="switchState('properties_id155');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id164" style="display:block">
+                           <div id="properties_id155" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -23789,12 +23330,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id164" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id164');"
+                           <div class="floatRight"><input id="button_facets_id155" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id155');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id164" style="display:block">
+                           <div id="facets_id155" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -23915,16 +23456,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id164" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id164');"
+                           <div class="floatRight"><input id="button_usedBy_id155" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id155');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id164" style="display:block">
+                           <div id="usedBy_id155" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id163" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id154" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.image.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -23934,12 +23475,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id164" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id164');"
+                           <div class="floatRight"><input id="button_source_id155" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id155');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id164" style="display:block">
+                           <div id="source_id155" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -23983,7 +23524,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id165"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id156"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @fsnocheck</span></div>
       <table class="rt">
          <tr>
@@ -24003,13 +23544,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id165" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id156" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id165');"
+                                     onclick="switchState('annotations_id156');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id165" style="display:block">
+                           <div id="annotations_id156" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -24028,13 +23569,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id165" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id156" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id165');"
+                                     onclick="switchState('properties_id156');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id165" style="display:block">
+                           <div id="properties_id156" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -24049,16 +23590,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id165" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id165');"
+                           <div class="floatRight"><input id="button_usedBy_id156" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id156');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id165" style="display:block">
+                           <div id="usedBy_id156" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -24068,12 +23609,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id165" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id165');"
+                           <div class="floatRight"><input id="button_source_id156" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id156');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id165" style="display:block">
+                           <div id="source_id156" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -24097,7 +23638,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id166"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id157"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @lvm</span></div>
       <table class="rt">
          <tr>
@@ -24121,13 +23662,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id166" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id157" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id166');"
+                                     onclick="switchState('properties_id157');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id166" style="display:block">
+                           <div id="properties_id157" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -24142,16 +23683,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id166" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id166');"
+                           <div class="floatRight"><input id="button_usedBy_id157" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id157');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id166" style="display:block">
+                           <div id="usedBy_id157" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -24161,12 +23702,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id166" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id166');"
+                           <div class="floatRight"><input id="button_source_id157" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id157');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id166" style="display:block">
+                           <div id="source_id157" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -24186,7 +23727,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id167"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id158"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @checkprebuilt</span></div>
       <table class="rt">
          <tr>
@@ -24210,13 +23751,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id167" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id158" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id167');"
+                                     onclick="switchState('properties_id158');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id167" style="display:block">
+                           <div id="properties_id158" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -24231,16 +23772,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id167" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id167');"
+                           <div class="floatRight"><input id="button_usedBy_id158" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id158');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id167" style="display:block">
+                           <div id="usedBy_id158" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -24250,12 +23791,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id167" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id167');"
+                           <div class="floatRight"><input id="button_source_id158" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id158');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id167" style="display:block">
+                           <div id="source_id158" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -24275,7 +23816,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id168"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id159"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @bootprofile</span></div>
       <table class="rt">
          <tr>
@@ -24295,16 +23836,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id168" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id168');"
+                           <div class="floatRight"><input id="button_usedBy_id159" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id159');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id168" style="display:block">
+                           <div id="usedBy_id159" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -24314,12 +23855,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id168" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id168');"
+                           <div class="floatRight"><input id="button_source_id159" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id159');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id168" style="display:block">
+                           <div id="source_id159" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -24339,7 +23880,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id169"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id160"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @bootkernel</span></div>
       <table class="rt">
          <tr>
@@ -24359,16 +23900,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id169" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id169');"
+                           <div class="floatRight"><input id="button_usedBy_id160" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id160');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id169" style="display:block">
+                           <div id="usedBy_id160" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -24378,12 +23919,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id169" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id169');"
+                           <div class="floatRight"><input id="button_source_id160" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id160');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id169" style="display:block">
+                           <div id="source_id160" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -24403,7 +23944,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id170"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id161"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @boot</span></div>
       <table class="rt">
          <tr>
@@ -24423,16 +23964,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id170" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id170');"
+                           <div class="floatRight"><input id="button_usedBy_id161" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id161');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id170" style="display:block">
+                           <div id="usedBy_id161" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -24442,12 +23983,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id170" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id170');"
+                           <div class="floatRight"><input id="button_source_id161" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id161');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id170" style="display:block">
+                           <div id="source_id161" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -24467,7 +24008,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id171"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id162"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @volid</span></div>
       <table class="rt">
          <tr>
@@ -24487,16 +24028,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id171" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id171');"
+                           <div class="floatRight"><input id="button_usedBy_id162" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id162');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id171" style="display:block">
+                           <div id="usedBy_id162" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -24506,12 +24047,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id171" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id171');"
+                           <div class="floatRight"><input id="button_source_id162" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id162');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id171" style="display:block">
+                           <div id="source_id162" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -24531,7 +24072,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id172"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id163"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @flags</span></div>
       <table class="rt">
          <tr>
@@ -24555,13 +24096,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id172" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id163" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id172');"
+                                     onclick="switchState('properties_id163');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id172" style="display:block">
+                           <div id="properties_id163" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -24576,12 +24117,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id172" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id172');"
+                           <div class="floatRight"><input id="button_facets_id163" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id163');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id172" style="display:block">
+                           <div id="facets_id163" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -24611,16 +24152,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id172" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id172');"
+                           <div class="floatRight"><input id="button_usedBy_id163" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id163');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id172" style="display:block">
+                           <div id="usedBy_id163" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -24630,12 +24171,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id172" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id172');"
+                           <div class="floatRight"><input id="button_source_id163" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id163');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id172" style="display:block">
+                           <div id="source_id163" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -24663,7 +24204,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id173"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id164"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @hybrid</span></div>
       <table class="rt">
          <tr>
@@ -24687,13 +24228,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id173" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id164" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id173');"
+                                     onclick="switchState('properties_id164');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id173" style="display:block">
+                           <div id="properties_id164" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -24708,16 +24249,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id173" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id173');"
+                           <div class="floatRight"><input id="button_usedBy_id164" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id164');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id173" style="display:block">
+                           <div id="usedBy_id164" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -24727,12 +24268,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id173" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id173');"
+                           <div class="floatRight"><input id="button_source_id164" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id164');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id173" style="display:block">
+                           <div id="source_id164" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -24752,7 +24293,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id174"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id165"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @hybridpersistent</span></div>
       <table class="rt">
          <tr>
@@ -24776,13 +24317,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id174" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id165" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id174');"
+                                     onclick="switchState('properties_id165');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id174" style="display:block">
+                           <div id="properties_id165" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -24797,16 +24338,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id174" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id174');"
+                           <div class="floatRight"><input id="button_usedBy_id165" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id165');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id174" style="display:block">
+                           <div id="usedBy_id165" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -24816,12 +24357,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id174" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id174');"
+                           <div class="floatRight"><input id="button_source_id165" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id165');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id174" style="display:block">
+                           <div id="source_id165" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -24841,7 +24382,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id175"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id166"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @bootloader</span></div>
       <table class="rt">
          <tr>
@@ -24865,13 +24406,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id175" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id166" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id175');"
+                                     onclick="switchState('properties_id166');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id175" style="display:block">
+                           <div id="properties_id166" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -24886,12 +24427,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id175" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id175');"
+                           <div class="floatRight"><input id="button_facets_id166" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id166');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id175" style="display:block">
+                           <div id="facets_id166" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -24914,6 +24455,13 @@
                                        <div class="annotation"></div>
                                     </td>
                                  </tr>
+                                 <tr>
+                                    <td class="firstColumn">enumeration</td>
+                                    <td width="30%"><b>zipl</b></td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
                               </table>
                            </div>
                         </td>
@@ -24921,16 +24469,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id175" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id175');"
+                           <div class="floatRight"><input id="button_usedBy_id166" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id166');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id175" style="display:block">
+                           <div id="usedBy_id166" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -24940,12 +24488,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id175" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id175');"
+                           <div class="floatRight"><input id="button_source_id166" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id166');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id175" style="display:block">
+                           <div id="source_id166" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -24955,6 +24503,7 @@
       </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"extlinux"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"grub"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"syslinux"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"zipl"</span><span class="tokenElement">/></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
@@ -24973,7 +24522,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id176"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id167"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @compressed</span></div>
       <table class="rt">
          <tr>
@@ -24997,13 +24546,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id176" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id167" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id176');"
+                                     onclick="switchState('properties_id167');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id176" style="display:block">
+                           <div id="properties_id167" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -25018,16 +24567,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id176" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id176');"
+                           <div class="floatRight"><input id="button_usedBy_id167" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id167');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id176" style="display:block">
+                           <div id="usedBy_id167" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -25037,12 +24586,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id176" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id176');"
+                           <div class="floatRight"><input id="button_source_id167" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id167');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id176" style="display:block">
+                           <div id="source_id167" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -25062,7 +24611,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id177"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id168"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @vga</span></div>
       <table class="rt">
          <tr>
@@ -25082,16 +24631,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id177" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id177');"
+                           <div class="floatRight"><input id="button_usedBy_id168" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id168');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id177" style="display:block">
+                           <div id="usedBy_id168" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -25101,12 +24650,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id177" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id177');"
+                           <div class="floatRight"><input id="button_source_id168" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id168');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id177" style="display:block">
+                           <div id="source_id168" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -25126,7 +24675,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id178"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id169"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @luks</span></div>
       <table class="rt">
          <tr>
@@ -25146,16 +24695,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id178" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id178');"
+                           <div class="floatRight"><input id="button_usedBy_id169" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id169');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id178" style="display:block">
+                           <div id="usedBy_id169" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -25165,12 +24714,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id178" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id178');"
+                           <div class="floatRight"><input id="button_source_id169" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id169');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id178" style="display:block">
+                           <div id="source_id169" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -25190,7 +24739,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id179"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id170"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @filesystem</span></div>
       <table class="rt">
          <tr>
@@ -25214,13 +24763,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id179" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id170" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id179');"
+                                     onclick="switchState('properties_id170');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id179" style="display:block">
+                           <div id="properties_id170" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -25235,12 +24784,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id179" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id179');"
+                           <div class="floatRight"><input id="button_facets_id170" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id170');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id179" style="display:block">
+                           <div id="facets_id170" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -25291,16 +24840,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id179" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id179');"
+                           <div class="floatRight"><input id="button_usedBy_id170" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id170');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id179" style="display:block">
+                           <div id="usedBy_id170" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -25310,12 +24859,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id179" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id179');"
+                           <div class="floatRight"><input id="button_source_id170" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id170');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id179" style="display:block">
+                           <div id="source_id170" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -25346,7 +24895,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id180"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id171"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @fsreadonly</span></div>
       <table class="rt">
          <tr>
@@ -25366,13 +24915,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id180" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id171" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id180');"
+                                     onclick="switchState('annotations_id171');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id180" style="display:block">
+                           <div id="annotations_id171" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -25391,13 +24940,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id180" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id171" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id180');"
+                                     onclick="switchState('properties_id171');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id180" style="display:block">
+                           <div id="properties_id171" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -25412,12 +24961,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id180" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id180');"
+                           <div class="floatRight"><input id="button_facets_id171" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id171');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id180" style="display:block">
+                           <div id="facets_id171" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -25461,16 +25010,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id180" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id180');"
+                           <div class="floatRight"><input id="button_usedBy_id171" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id171');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id180" style="display:block">
+                           <div id="usedBy_id171" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -25480,12 +25029,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id180" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id180');"
+                           <div class="floatRight"><input id="button_source_id171" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id171');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id180" style="display:block">
+                           <div id="source_id171" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -25518,7 +25067,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id181"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id172"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @fsreadwrite</span></div>
       <table class="rt">
          <tr>
@@ -25538,13 +25087,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id181" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id172" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id181');"
+                                     onclick="switchState('annotations_id172');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id181" style="display:block">
+                           <div id="annotations_id172" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -25563,13 +25112,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id181" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id172" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id181');"
+                                     onclick="switchState('properties_id172');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id181" style="display:block">
+                           <div id="properties_id172" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -25584,12 +25133,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id181" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id181');"
+                           <div class="floatRight"><input id="button_facets_id172" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id172');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id181" style="display:block">
+                           <div id="facets_id172" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -25626,16 +25175,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id181" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id181');"
+                           <div class="floatRight"><input id="button_usedBy_id172" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id172');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id181" style="display:block">
+                           <div id="usedBy_id172" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -25645,12 +25194,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id181" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id181');"
+                           <div class="floatRight"><input id="button_source_id172" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id172');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id181" style="display:block">
+                           <div id="source_id172" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -25682,7 +25231,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id182"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id173"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @baseroot</span></div>
       <table class="rt">
          <tr>
@@ -25702,13 +25251,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id182" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id173" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id182');"
+                                     onclick="switchState('annotations_id173');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id182" style="display:block">
+                           <div id="annotations_id173" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -25723,16 +25272,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id182" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id182');"
+                           <div class="floatRight"><input id="button_usedBy_id173" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id173');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id182" style="display:block">
+                           <div id="usedBy_id173" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -25742,12 +25291,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id182" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id182');"
+                           <div class="floatRight"><input id="button_source_id173" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id173');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id182" style="display:block">
+                           <div id="source_id173" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -25771,7 +25320,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id183"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id174"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @format</span></div>
       <table class="rt">
          <tr>
@@ -25789,19 +25338,40 @@
                         <td>No namespace</td>
                      </tr>
                      <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Annotations</b></div>
+                           <div class="floatRight"><input id="button_annotations_id174" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('annotations_id174');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="annotations_id174" style="display:block">
+                              <div class="annotation">
+                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                        class="preWrapContainer">
+                                    <tr>
+                                       <td width="100%"><pre><span class="tokenText">Specifies the format of the virtual disk.</span></pre></td>
+                                    </tr>
+                                 </table>
+                              </div>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
                         <td class="firstColumn"><b>Type</b></td>
                         <td>restriction of <b>xs:token</b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id183" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id174" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id183');"
+                                     onclick="switchState('properties_id174');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id183" style="display:block">
+                           <div id="properties_id174" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -25816,96 +25386,268 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id183" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id183');"
+                           <div class="floatRight"><input id="button_facets_id174" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id174');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id183" style="display:block">
+                           <div id="facets_id174" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>bochs</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>cloop</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>cow</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>dmg</b></td>
+                                    <td width="30%"><b>ovf</b></td>
                                     <td>
                                        <div class="annotation"></div>
                                     </td>
                                  </tr>
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>iso</b></td>
+                                    <td width="30%"><b>qcow2</b></td>
                                     <td>
                                        <div class="annotation"></div>
                                     </td>
                                  </tr>
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>ovf</b></td>
+                                    <td width="30%"><b>vmdk</b></td>
                                     <td>
                                        <div class="annotation"></div>
                                     </td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Used by</b></div>
+                           <div class="floatRight"><input id="button_usedBy_id174" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id174');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="usedBy_id174" style="display:block">
+                              <table class="usedByTable">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>qcow</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
+                                    <td class="firstColumn">Attribute Group </td>
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id174" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id174');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="source_id174" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>qcow2</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"format"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Specifies the format of the virtual disk.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ovf"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"qcow2"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vmdk"</span><span class="tokenElement">/></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
+</span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id175"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @installiso</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>No namespace</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Annotations</b></div>
+                           <div class="floatRight"><input id="button_annotations_id175" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('annotations_id175');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="annotations_id175" style="display:block">
+                              <div class="annotation">
+                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                        class="preWrapContainer">
+                                    <tr>
+                                       <td width="100%"><pre><span class="tokenText">Specifies if a install iso should be created (oem only)</span></pre></td>
+                                    </tr>
+                                 </table>
+                              </div>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td><b>xs:boolean</b></td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Properties</b></div>
+                           <div class="floatRight"><input id="button_properties_id175" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('properties_id175');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="properties_id175" style="display:block">
+                              <table class="propertiesTable">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>usb</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
+                                    <td class="firstColumn">content:
+                                       
                                     </td>
+                                    <td><b>simple</b></td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Used by</b></div>
+                           <div class="floatRight"><input id="button_usedBy_id175" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id175');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="usedBy_id175" style="display:block">
+                              <table class="usedByTable">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>vmdk</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
+                                    <td class="firstColumn">Attribute Group </td>
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id175" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id175');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="source_id175" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>vpc</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"installiso"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Specifies if a install iso should be created (oem only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+</span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id176"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @installstick</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>No namespace</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Annotations</b></div>
+                           <div class="floatRight"><input id="button_annotations_id176" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('annotations_id176');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="annotations_id176" style="display:block">
+                              <div class="annotation">
+                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                        class="preWrapContainer">
+                                    <tr>
+                                       <td width="100%"><pre><span class="tokenText">Specifies if a install stick should be created (oem only)</span></pre></td>
+                                    </tr>
+                                 </table>
+                              </div>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td><b>xs:boolean</b></td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Properties</b></div>
+                           <div class="floatRight"><input id="button_properties_id176" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('properties_id176');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="properties_id176" style="display:block">
+                              <table class="propertiesTable">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>vvfat</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
+                                    <td class="firstColumn">content:
+                                       
                                     </td>
+                                    <td><b>simple</b></td>
                                  </tr>
                               </table>
                            </div>
@@ -25914,16 +25656,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id183" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id183');"
+                           <div class="floatRight"><input id="button_usedBy_id176" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id176');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id183" style="display:block">
+                           <div id="usedBy_id176" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -25933,32 +25675,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id183" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id183');"
+                           <div class="floatRight"><input id="button_source_id176" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id176');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id183" style="display:block">
+                           <div id="source_id176" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"format"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"bochs"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"cloop"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"cow"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"dmg"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"iso"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ovf"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"qcow"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"qcow2"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"usb"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vmdk"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vpc"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vvfat"</span><span class="tokenElement">/></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"installstick"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Specifies if a install stick should be created (oem only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
                               </table>
@@ -25975,7 +25704,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id184"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id177"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @primary</span></div>
       <table class="rt">
          <tr>
@@ -25995,13 +25724,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id184" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id177" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id184');"
+                                     onclick="switchState('annotations_id177');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id184" style="display:block">
+                           <div id="annotations_id177" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -26020,13 +25749,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id184" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id177" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id184');"
+                                     onclick="switchState('properties_id177');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id184" style="display:block">
+                           <div id="properties_id177" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -26041,16 +25770,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id184" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id184');"
+                           <div class="floatRight"><input id="button_usedBy_id177" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id177');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id184" style="display:block">
+                           <div id="usedBy_id177" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -26060,12 +25789,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id184" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id184');"
+                           <div class="floatRight"><input id="button_source_id177" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id177');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id184" style="display:block">
+                           <div id="source_id177" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -26089,7 +25818,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id185"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+      </table><a id="id178"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b> / @kernelcmdline</span></div>
       <table class="rt">
          <tr>
@@ -26109,16 +25838,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id185" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id185');"
+                           <div class="floatRight"><input id="button_usedBy_id178" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id178');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id185" style="display:block">
+                           <div id="usedBy_id178" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -26128,12 +25857,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id185" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id185');"
+                           <div class="floatRight"><input id="button_source_id178" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id178');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id185" style="display:block">
+                           <div id="source_id178" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -26153,7 +25882,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id203"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id202" target="mainFrame" title="No namespace"
+      </table><a id="id196"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id195" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.preferences.attlist</a></b> / @profiles</span></div>
       <table class="rt">
          <tr>
@@ -26173,13 +25902,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id203" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id196" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id203');"
+                                     onclick="switchState('annotations_id196');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id203" style="display:block">
+                           <div id="annotations_id196" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -26194,16 +25923,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id203" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id203');"
+                           <div class="floatRight"><input id="button_usedBy_id196" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id196');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id203" style="display:block">
+                           <div id="usedBy_id196" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id202" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id195" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.preferences.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -26213,12 +25942,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id203" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id203');"
+                           <div class="floatRight"><input id="button_source_id196" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id196');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id203" style="display:block">
+                           <div id="source_id196" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -26242,7 +25971,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id209"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id208" target="mainFrame" title="No namespace"
+      </table><a id="id202"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id201" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.description.attribute</a></b> / @description</span></div>
       <table class="rt">
          <tr>
@@ -26262,13 +25991,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id209" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id202" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id209');"
+                                     onclick="switchState('annotations_id202');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id209" style="display:block">
+                           <div id="annotations_id202" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -26283,13 +26012,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id209" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id202" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id209');"
+                                     onclick="switchState('properties_id202');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id209" style="display:block">
+                           <div id="properties_id202" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -26304,16 +26033,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id209" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id209');"
+                           <div class="floatRight"><input id="button_usedBy_id202" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id202');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id209" style="display:block">
+                           <div id="usedBy_id202" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id208" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id201" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.description.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -26323,12 +26052,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id209" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id209');"
+                           <div class="floatRight"><input id="button_source_id202" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id202');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id209" style="display:block">
+                           <div id="source_id202" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -26352,7 +26081,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id210"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id206" target="mainFrame" title="No namespace"
+      </table><a id="id203"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id199" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.attlist</a></b> / @import</span></div>
       <table class="rt">
          <tr>
@@ -26376,13 +26105,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id210" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id203" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id210');"
+                                     onclick="switchState('properties_id203');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id210" style="display:block">
+                           <div id="properties_id203" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -26397,16 +26126,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id210" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id210');"
+                           <div class="floatRight"><input id="button_usedBy_id203" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id203');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id210" style="display:block">
+                           <div id="usedBy_id203" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id206" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id199" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -26416,12 +26145,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id210" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id210');"
+                           <div class="floatRight"><input id="button_source_id203" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id203');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id210" style="display:block">
+                           <div id="source_id203" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -26441,7 +26170,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id217"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id216" target="mainFrame" title="No namespace"
+      </table><a id="id210"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id209" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.id.attribute</a></b> / @id</span></div>
       <table class="rt">
          <tr>
@@ -26461,13 +26190,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id217" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id210" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id217');"
+                                     onclick="switchState('annotations_id210');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id217" style="display:block">
+                           <div id="annotations_id210" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -26486,13 +26215,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id217" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id210" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id217');"
+                                     onclick="switchState('properties_id210');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id217" style="display:block">
+                           <div id="properties_id210" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -26507,16 +26236,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id217" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id217');"
+                           <div class="floatRight"><input id="button_usedBy_id210" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id210');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id217" style="display:block">
+                           <div id="usedBy_id210" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id216" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id209" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.id.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -26526,12 +26255,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id217" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id217');"
+                           <div class="floatRight"><input id="button_source_id210" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id210');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id217" style="display:block">
+                           <div id="source_id210" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -26555,7 +26284,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id219"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id214" target="mainFrame" title="No namespace"
+      </table><a id="id212"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id207" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.attlist</a></b> / @fallback</span></div>
       <table class="rt">
          <tr>
@@ -26579,13 +26308,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id219" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id212" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id219');"
+                                     onclick="switchState('properties_id212');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id219" style="display:block">
+                           <div id="properties_id212" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -26600,16 +26329,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id219" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id219');"
+                           <div class="floatRight"><input id="button_usedBy_id212" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id212');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id219" style="display:block">
+                           <div id="usedBy_id212" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id214" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id207" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -26619,12 +26348,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id219" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id219');"
+                           <div class="floatRight"><input id="button_source_id212" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id212');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id219" style="display:block">
+                           <div id="source_id212" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -26644,7 +26373,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id223"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id222" target="mainFrame" title="No namespace"
+      </table><a id="id216"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id215" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.requiredarch.ref.attribute</a></b> / @ref</span></div>
       <table class="rt">
          <tr>
@@ -26668,13 +26397,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id223" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id216" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id223');"
+                                     onclick="switchState('properties_id216');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id223" style="display:block">
+                           <div id="properties_id216" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -26689,16 +26418,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id223" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id223');"
+                           <div class="floatRight"><input id="button_usedBy_id216" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id216');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id223" style="display:block">
+                           <div id="usedBy_id216" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id222" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id215" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.requiredarch.ref.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -26708,12 +26437,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id223" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id223');"
+                           <div class="floatRight"><input id="button_source_id216" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id216');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id223" style="display:block">
+                           <div id="source_id216" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -26733,7 +26462,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id237"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id236" target="mainFrame" title="No namespace"
+      </table><a id="id230"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id229" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.path.attribute</a></b> / @path</span></div>
       <table class="rt">
          <tr>
@@ -26753,13 +26482,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id237" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id230" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id237');"
+                                     onclick="switchState('annotations_id230');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id237" style="display:block">
+                           <div id="annotations_id230" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -26774,13 +26503,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id237" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id230" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id237');"
+                                     onclick="switchState('properties_id230');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id237" style="display:block">
+                           <div id="properties_id230" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -26795,16 +26524,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id237" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id237');"
+                           <div class="floatRight"><input id="button_usedBy_id230" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id230');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id237" style="display:block">
+                           <div id="usedBy_id230" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id236" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id229" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.path.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -26814,12 +26543,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id237" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id237');"
+                           <div class="floatRight"><input id="button_source_id230" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id230');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id237" style="display:block">
+                           <div id="source_id230" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -26843,7 +26572,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id240"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id239" target="mainFrame" title="No namespace"
+      </table><a id="id233"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id232" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.name.attribute</a></b> / @name</span></div>
       <table class="rt">
          <tr>
@@ -26867,13 +26596,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id240" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id233" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id240');"
+                                     onclick="switchState('properties_id233');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id240" style="display:block">
+                           <div id="properties_id233" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -26888,16 +26617,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id240" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id240');"
+                           <div class="floatRight"><input id="button_usedBy_id233" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id233');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id240" style="display:block">
+                           <div id="usedBy_id233" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id239" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id232" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.name.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -26907,12 +26636,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id240" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id240');"
+                           <div class="floatRight"><input id="button_source_id233" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id233');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id240" style="display:block">
+                           <div id="source_id233" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -26932,7 +26661,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id242"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
+      </table><a id="id235"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id234" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.priority.attribute</a></b> / @priority</span></div>
       <table class="rt">
          <tr>
@@ -26952,13 +26681,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id242" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id235" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id242');"
+                                     onclick="switchState('annotations_id235');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id242" style="display:block">
+                           <div id="annotations_id235" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -26973,13 +26702,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id242" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id235" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id242');"
+                                     onclick="switchState('properties_id235');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id242" style="display:block">
+                           <div id="properties_id235" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -26994,16 +26723,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id242" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id242');"
+                           <div class="floatRight"><input id="button_usedBy_id235" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id235');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id242" style="display:block">
+                           <div id="usedBy_id235" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id234" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.priority.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -27013,12 +26742,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id242" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id242');"
+                           <div class="floatRight"><input id="button_source_id235" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id235');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id242" style="display:block">
+                           <div id="source_id235" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -27042,7 +26771,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id243"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id238" target="mainFrame" title="No namespace"
+      </table><a id="id236"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.attlist</a></b> / @username</span></div>
       <table class="rt">
          <tr>
@@ -27062,13 +26791,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id243" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id236" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id243');"
+                                     onclick="switchState('annotations_id236');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id243" style="display:block">
+                           <div id="annotations_id236" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -27083,16 +26812,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id243" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id243');"
+                           <div class="floatRight"><input id="button_usedBy_id236" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id236');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id243" style="display:block">
+                           <div id="usedBy_id236" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id238" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -27102,12 +26831,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id243" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id243');"
+                           <div class="floatRight"><input id="button_source_id236" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id236');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id243" style="display:block">
+                           <div id="source_id236" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -27131,7 +26860,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id244"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id238" target="mainFrame" title="No namespace"
+      </table><a id="id237"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.attlist</a></b> / @pwd</span></div>
       <table class="rt">
          <tr>
@@ -27151,13 +26880,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id244" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id237" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id244');"
+                                     onclick="switchState('annotations_id237');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id244" style="display:block">
+                           <div id="annotations_id237" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -27172,16 +26901,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id244" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id244');"
+                           <div class="floatRight"><input id="button_usedBy_id237" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id237');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id244" style="display:block">
+                           <div id="usedBy_id237" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id238" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -27191,12 +26920,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id244" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id244');"
+                           <div class="floatRight"><input id="button_source_id237" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id237');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id244" style="display:block">
+                           <div id="source_id237" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -27220,7 +26949,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id245"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id238" target="mainFrame" title="No namespace"
+      </table><a id="id238"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.attlist</a></b> / @local</span></div>
       <table class="rt">
          <tr>
@@ -27244,13 +26973,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id245" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id238" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id245');"
+                                     onclick="switchState('properties_id238');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id245" style="display:block">
+                           <div id="properties_id238" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -27265,16 +26994,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id245" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id245');"
+                           <div class="floatRight"><input id="button_usedBy_id238" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id238');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id245" style="display:block">
+                           <div id="usedBy_id238" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id238" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -27284,12 +27013,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id245" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id245');"
+                           <div class="floatRight"><input id="button_source_id238" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id238');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id245" style="display:block">
+                           <div id="source_id238" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -27309,7 +27038,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id250"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+      </table><a id="id243"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b> / @arch</span></div>
       <table class="rt">
          <tr>
@@ -27329,13 +27058,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id250" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id243" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id250');"
+                                     onclick="switchState('annotations_id243');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id250" style="display:block">
+                           <div id="annotations_id243" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -27350,16 +27079,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id250" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id250');"
+                           <div class="floatRight"><input id="button_usedBy_id243" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id243');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id250" style="display:block">
+                           <div id="usedBy_id243" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -27369,12 +27098,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id250" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id250');"
+                           <div class="floatRight"><input id="button_source_id243" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id243');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id250" style="display:block">
+                           <div id="source_id243" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -27398,7 +27127,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id251"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+      </table><a id="id244"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b> / @forcerepo</span></div>
       <table class="rt">
          <tr>
@@ -27418,13 +27147,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id251" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id244" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id251');"
+                                     onclick="switchState('annotations_id244');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id251" style="display:block">
+                           <div id="annotations_id244" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -27443,13 +27172,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id251" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id244" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id251');"
+                                     onclick="switchState('properties_id244');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id251" style="display:block">
+                           <div id="properties_id244" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -27464,16 +27193,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id251" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id251');"
+                           <div class="floatRight"><input id="button_usedBy_id244" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id244');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id251" style="display:block">
+                           <div id="usedBy_id244" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -27483,12 +27212,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id251" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id251');"
+                           <div class="floatRight"><input id="button_source_id244" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id244');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id251" style="display:block">
+                           <div id="source_id244" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -27512,7 +27241,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id252"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+      </table><a id="id245"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b> / @addarch</span></div>
       <table class="rt">
          <tr>
@@ -27532,16 +27261,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id252" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id252');"
+                           <div class="floatRight"><input id="button_usedBy_id245" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id245');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id252" style="display:block">
+                           <div id="usedBy_id245" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -27551,12 +27280,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id252" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id252');"
+                           <div class="floatRight"><input id="button_source_id245" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id245');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id252" style="display:block">
+                           <div id="source_id245" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -27576,7 +27305,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id253"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+      </table><a id="id246"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b> / @removearch</span></div>
       <table class="rt">
          <tr>
@@ -27596,16 +27325,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id253" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id253');"
+                           <div class="floatRight"><input id="button_usedBy_id246" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id246');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id253" style="display:block">
+                           <div id="usedBy_id246" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -27615,12 +27344,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id253" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id253');"
+                           <div class="floatRight"><input id="button_source_id246" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id246');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id253" style="display:block">
+                           <div id="source_id246" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -27640,7 +27369,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id254"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+      </table><a id="id247"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b> / @onlyarch</span></div>
       <table class="rt">
          <tr>
@@ -27660,16 +27389,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id254" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id254');"
+                           <div class="floatRight"><input id="button_usedBy_id247" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id247');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id254" style="display:block">
+                           <div id="usedBy_id247" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -27679,12 +27408,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id254" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id254');"
+                           <div class="floatRight"><input id="button_source_id247" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id247');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id254" style="display:block">
+                           <div id="source_id247" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -27704,7 +27433,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id255"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+      </table><a id="id248"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b> / @source</span></div>
       <table class="rt">
          <tr>
@@ -27724,16 +27453,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id255" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id255');"
+                           <div class="floatRight"><input id="button_usedBy_id248" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id248');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id255" style="display:block">
+                           <div id="usedBy_id248" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -27743,12 +27472,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id255" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id255');"
+                           <div class="floatRight"><input id="button_source_id248" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id248');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id255" style="display:block">
+                           <div id="source_id248" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -27768,7 +27497,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id256"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+      </table><a id="id249"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b> / @script</span></div>
       <table class="rt">
          <tr>
@@ -27788,16 +27517,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id256" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id256');"
+                           <div class="floatRight"><input id="button_usedBy_id249" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id249');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id256" style="display:block">
+                           <div id="usedBy_id249" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -27807,12 +27536,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id256" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id256');"
+                           <div class="floatRight"><input id="button_source_id249" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id249');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id256" style="display:block">
+                           <div id="source_id249" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -27832,7 +27561,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id257"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+      </table><a id="id250"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b> / @medium</span></div>
       <table class="rt">
          <tr>
@@ -27856,13 +27585,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id257" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id250" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id257');"
+                                     onclick="switchState('properties_id250');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id257" style="display:block">
+                           <div id="properties_id250" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -27877,16 +27606,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id257" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id257');"
+                           <div class="floatRight"><input id="button_usedBy_id250" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id250');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id257" style="display:block">
+                           <div id="usedBy_id250" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -27896,12 +27625,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id257" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id257');"
+                           <div class="floatRight"><input id="button_source_id250" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id250');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id257" style="display:block">
+                           <div id="source_id250" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -27921,7 +27650,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id261"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id260" target="mainFrame" title="No namespace"
+      </table><a id="id254"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id253" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.url.attribute</a></b> / @url</span></div>
       <table class="rt">
          <tr>
@@ -27941,13 +27670,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id261" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id254" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id261');"
+                                     onclick="switchState('annotations_id254');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id261" style="display:block">
+                           <div id="annotations_id254" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -27962,13 +27691,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id261" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id254" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id261');"
+                                     onclick="switchState('properties_id254');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id261" style="display:block">
+                           <div id="properties_id254" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -27983,16 +27712,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id261" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id261');"
+                           <div class="floatRight"><input id="button_usedBy_id254" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id254');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id261" style="display:block">
+                           <div id="usedBy_id254" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id260" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id253" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.url.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -28002,12 +27731,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id261" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id261');"
+                           <div class="floatRight"><input id="button_source_id254" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id254');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id261" style="display:block">
+                           <div id="source_id254" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -28031,7 +27760,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id264"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id263" target="mainFrame" title="No namespace"
+      </table><a id="id257"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id256" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.script.attribute</a></b> / @script</span></div>
       <table class="rt">
          <tr>
@@ -28051,13 +27780,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id264" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id257" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id264');"
+                                     onclick="switchState('properties_id257');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id264" style="display:block">
+                           <div id="properties_id257" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -28072,16 +27801,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id264" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id264');"
+                           <div class="floatRight"><input id="button_usedBy_id257" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id257');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id264" style="display:block">
+                           <div id="usedBy_id257" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id263" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id256" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.script.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -28091,12 +27820,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id264" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id264');"
+                           <div class="floatRight"><input id="button_source_id257" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id257');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id264" style="display:block">
+                           <div id="source_id257" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -28116,7 +27845,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id266"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id265" target="mainFrame" title="No namespace"
+      </table><a id="id259"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id258" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.target.attribute</a></b> / @target</span></div>
       <table class="rt">
          <tr>
@@ -28136,13 +27865,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id266" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id259" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id266');"
+                                     onclick="switchState('annotations_id259');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id266" style="display:block">
+                           <div id="annotations_id259" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -28157,13 +27886,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id266" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id259" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id266');"
+                                     onclick="switchState('properties_id259');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id266" style="display:block">
+                           <div id="properties_id259" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -28178,16 +27907,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id266" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id266');"
+                           <div class="floatRight"><input id="button_usedBy_id259" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id259');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id266" style="display:block">
+                           <div id="usedBy_id259" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id265" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id258" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.target.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -28197,12 +27926,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id266" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id266');"
+                           <div class="floatRight"><input id="button_source_id259" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id259');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id266" style="display:block">
+                           <div id="source_id259" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -28226,7 +27955,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id269"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id268" target="mainFrame" title="No namespace"
+      </table><a id="id262"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id261" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.chroot.attlist</a></b> / @requires</span></div>
       <table class="rt">
          <tr>
@@ -28246,13 +27975,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id269" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id262" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id269');"
+                                     onclick="switchState('properties_id262');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id269" style="display:block">
+                           <div id="properties_id262" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -28267,16 +27996,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id269" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id269');"
+                           <div class="floatRight"><input id="button_usedBy_id262" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id262');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id269" style="display:block">
+                           <div id="usedBy_id262" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id268" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id261" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.chroot.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -28286,12 +28015,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id269" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id269');"
+                           <div class="floatRight"><input id="button_source_id262" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id262');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id269" style="display:block">
+                           <div id="source_id262" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -28311,7 +28040,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id275"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+      </table><a id="id268"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b> / @id</span></div>
       <table class="rt">
          <tr>
@@ -28331,13 +28060,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id275" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id268" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id275');"
+                                     onclick="switchState('annotations_id268');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id275" style="display:block">
+                           <div id="annotations_id268" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -28356,13 +28085,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id275" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id268" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id275');"
+                                     onclick="switchState('properties_id268');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id275" style="display:block">
+                           <div id="properties_id268" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -28377,16 +28106,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id275" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id275');"
+                           <div class="floatRight"><input id="button_usedBy_id268" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id268');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id275" style="display:block">
+                           <div id="usedBy_id268" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -28396,12 +28125,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id275" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id275');"
+                           <div class="floatRight"><input id="button_source_id268" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id268');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id275" style="display:block">
+                           <div id="source_id268" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -28425,7 +28154,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id276"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+      </table><a id="id269"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b> / @realname</span></div>
       <table class="rt">
          <tr>
@@ -28445,13 +28174,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id276" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id269" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id276');"
+                                     onclick="switchState('annotations_id269');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id276" style="display:block">
+                           <div id="annotations_id269" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -28466,16 +28195,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id276" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id276');"
+                           <div class="floatRight"><input id="button_usedBy_id269" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id269');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id276" style="display:block">
+                           <div id="usedBy_id269" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -28485,12 +28214,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id276" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id276');"
+                           <div class="floatRight"><input id="button_source_id269" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id269');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id276" style="display:block">
+                           <div id="source_id269" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -28514,7 +28243,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id279"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id278" target="mainFrame" title="No namespace"
+      </table><a id="id272"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id271" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pwd.attribute</a></b> / @pwd</span></div>
       <table class="rt">
          <tr>
@@ -28534,13 +28263,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id279" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id272" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id279');"
+                                     onclick="switchState('annotations_id272');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id279" style="display:block">
+                           <div id="annotations_id272" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -28555,13 +28284,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id279" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id272" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id279');"
+                                     onclick="switchState('properties_id272');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id279" style="display:block">
+                           <div id="properties_id272" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -28576,16 +28305,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id279" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id279');"
+                           <div class="floatRight"><input id="button_usedBy_id272" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id272');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id279" style="display:block">
+                           <div id="usedBy_id272" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id278" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id271" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pwd.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -28595,12 +28324,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id279" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id279');"
+                           <div class="floatRight"><input id="button_source_id272" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id272');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id279" style="display:block">
+                           <div id="source_id272" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -28624,7 +28353,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id280"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+      </table><a id="id273"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b> / @pwdformat</span></div>
       <table class="rt">
          <tr>
@@ -28644,13 +28373,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id280" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id273" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id280');"
+                                     onclick="switchState('annotations_id273');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id280" style="display:block">
+                           <div id="annotations_id273" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -28669,13 +28398,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id280" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id273" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id280');"
+                                     onclick="switchState('properties_id273');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id280" style="display:block">
+                           <div id="properties_id273" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -28690,12 +28419,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id280" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id280');"
+                           <div class="floatRight"><input id="button_facets_id273" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id273');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id280" style="display:block">
+                           <div id="facets_id273" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -28718,16 +28447,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id280" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id280');"
+                           <div class="floatRight"><input id="button_usedBy_id273" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id273');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id280" style="display:block">
+                           <div id="usedBy_id273" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -28737,12 +28466,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id280" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id280');"
+                           <div class="floatRight"><input id="button_source_id273" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id273');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id280" style="display:block">
+                           <div id="source_id273" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -28772,7 +28501,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id282"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id281" target="mainFrame" title="No namespace"
+      </table><a id="id275"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id274" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.home.attribute</a></b> / @home</span></div>
       <table class="rt">
          <tr>
@@ -28792,13 +28521,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id282" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id275" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id282');"
+                                     onclick="switchState('annotations_id275');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id282" style="display:block">
+                           <div id="annotations_id275" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -28813,13 +28542,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id282" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id275" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id282');"
+                                     onclick="switchState('properties_id275');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id282" style="display:block">
+                           <div id="properties_id275" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -28834,16 +28563,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id282" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id282');"
+                           <div class="floatRight"><input id="button_usedBy_id275" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id275');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id282" style="display:block">
+                           <div id="usedBy_id275" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id281" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id274" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.home.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -28853,12 +28582,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id282" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id282');"
+                           <div class="floatRight"><input id="button_source_id275" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id275');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id282" style="display:block">
+                           <div id="source_id275" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -28882,7 +28611,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id283"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+      </table><a id="id276"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b> / @shell</span></div>
       <table class="rt">
          <tr>
@@ -28902,13 +28631,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id283" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id276" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id283');"
+                                     onclick="switchState('annotations_id276');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id283" style="display:block">
+                           <div id="annotations_id276" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -28923,16 +28652,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id283" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id283');"
+                           <div class="floatRight"><input id="button_usedBy_id276" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id276');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id283" style="display:block">
+                           <div id="usedBy_id276" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -28942,12 +28671,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id283" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id283');"
+                           <div class="floatRight"><input id="button_source_id276" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id276');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id283" style="display:block">
+                           <div id="source_id276" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -28971,7 +28700,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id286"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id285" target="mainFrame" title="No namespace"
+      </table><a id="id279"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id278" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.group.attribute</a></b> / @group</span></div>
       <table class="rt">
          <tr>
@@ -28991,13 +28720,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id286" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id279" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id286');"
+                                     onclick="switchState('annotations_id279');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id286" style="display:block">
+                           <div id="annotations_id279" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -29012,13 +28741,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id286" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id279" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id286');"
+                                     onclick="switchState('properties_id279');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id286" style="display:block">
+                           <div id="properties_id279" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -29033,16 +28762,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id286" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id286');"
+                           <div class="floatRight"><input id="button_usedBy_id279" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id279');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id286" style="display:block">
+                           <div id="usedBy_id279" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id285" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id278" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.group.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -29052,12 +28781,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id286" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id286');"
+                           <div class="floatRight"><input id="button_source_id279" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id279');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id286" style="display:block">
+                           <div id="source_id279" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -29081,7 +28810,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id287"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id284" target="mainFrame" title="No namespace"
+      </table><a id="id280"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id277" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.attlist</a></b> / @id</span></div>
       <table class="rt">
          <tr>
@@ -29101,13 +28830,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id287" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id280" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id287');"
+                                     onclick="switchState('annotations_id280');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id287" style="display:block">
+                           <div id="annotations_id280" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -29126,13 +28855,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id287" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id280" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id287');"
+                                     onclick="switchState('properties_id280');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id287" style="display:block">
+                           <div id="properties_id280" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -29147,16 +28876,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id287" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id287');"
+                           <div class="floatRight"><input id="button_usedBy_id280" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id280');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id287" style="display:block">
+                           <div id="usedBy_id280" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id284" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id277" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -29166,12 +28895,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id287" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id287');"
+                           <div class="floatRight"><input id="button_source_id280" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id280');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id287" style="display:block">
+                           <div id="source_id280" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -29195,7 +28924,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id291"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id290" target="mainFrame" title="No namespace"
+      </table><a id="id284"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id283" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.type.attribute</a></b> / @type</span></div>
       <table class="rt">
          <tr>
@@ -29219,13 +28948,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id291" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id284" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id291');"
+                                     onclick="switchState('properties_id284');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id291" style="display:block">
+                           <div id="properties_id284" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -29240,12 +28969,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id291" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id291');"
+                           <div class="floatRight"><input id="button_facets_id284" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id284');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id291" style="display:block">
+                           <div id="facets_id284" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -29282,16 +29011,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id291" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id291');"
+                           <div class="floatRight"><input id="button_usedBy_id284" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id284');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id291" style="display:block">
+                           <div id="usedBy_id284" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id290" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id283" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.type.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -29301,12 +29030,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id291" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id291');"
+                           <div class="floatRight"><input id="button_source_id284" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id284');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id291" style="display:block">
+                           <div id="source_id284" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -29335,7 +29064,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id292"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id289" target="mainFrame" title="No namespace"
+      </table><a id="id285"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id282" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.attlist</a></b> / @profiles</span></div>
       <table class="rt">
          <tr>
@@ -29355,13 +29084,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id292" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id285" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id292');"
+                                     onclick="switchState('annotations_id285');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id292" style="display:block">
+                           <div id="annotations_id285" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -29376,16 +29105,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id292" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id292');"
+                           <div class="floatRight"><input id="button_usedBy_id285" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id285');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id292" style="display:block">
+                           <div id="usedBy_id285" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id289" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id282" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -29395,12 +29124,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id292" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id292');"
+                           <div class="floatRight"><input id="button_source_id285" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id285');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id292" style="display:block">
+                           <div id="source_id285" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -29424,7 +29153,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id296"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id295" target="mainFrame" title="No namespace"
+      </table><a id="id289"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id288" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.type.attribute</a></b> / @type</span></div>
       <table class="rt">
          <tr>
@@ -29444,13 +29173,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id296" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id289" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id296');"
+                                     onclick="switchState('annotations_id289');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id296" style="display:block">
+                           <div id="annotations_id289" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -29469,13 +29198,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id296" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id289" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id296');"
+                                     onclick="switchState('properties_id289');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id296" style="display:block">
+                           <div id="properties_id289" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -29490,12 +29219,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id296" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id296');"
+                           <div class="floatRight"><input id="button_facets_id289" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id289');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id296" style="display:block">
+                           <div id="facets_id289" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -29581,16 +29310,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id296" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id296');"
+                           <div class="floatRight"><input id="button_usedBy_id289" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id289');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id296" style="display:block">
+                           <div id="usedBy_id289" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id295" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id288" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.type.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -29600,12 +29329,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id296" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id296');"
+                           <div class="floatRight"><input id="button_source_id289" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id289');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id296" style="display:block">
+                           <div id="source_id289" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -29644,7 +29373,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id297"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
+      </table><a id="id290"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.attlist</a></b> / @profiles</span></div>
       <table class="rt">
          <tr>
@@ -29664,13 +29393,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id297" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id290" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id297');"
+                                     onclick="switchState('annotations_id290');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id297" style="display:block">
+                           <div id="annotations_id290" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -29685,16 +29414,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id297" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id297');"
+                           <div class="floatRight"><input id="button_usedBy_id290" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id290');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id297" style="display:block">
+                           <div id="usedBy_id290" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -29704,12 +29433,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id297" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id297');"
+                           <div class="floatRight"><input id="button_source_id290" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id290');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id297" style="display:block">
+                           <div id="source_id290" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -29733,7 +29462,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id298"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
+      </table><a id="id291"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.attlist</a></b> / @status</span></div>
       <table class="rt">
          <tr>
@@ -29757,13 +29486,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id298" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id291" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id298');"
+                                     onclick="switchState('properties_id291');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id298" style="display:block">
+                           <div id="properties_id291" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -29778,12 +29507,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id298" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id298');"
+                           <div class="floatRight"><input id="button_facets_id291" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id291');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id298" style="display:block">
+                           <div id="facets_id291" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -29806,16 +29535,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id298" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id298');"
+                           <div class="floatRight"><input id="button_usedBy_id291" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id291');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id298" style="display:block">
+                           <div id="usedBy_id291" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -29825,12 +29554,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id298" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id298');"
+                           <div class="floatRight"><input id="button_source_id291" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id291');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id298" style="display:block">
+                           <div id="source_id291" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -29857,7 +29586,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id299"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
+      </table><a id="id292"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.attlist</a></b> / @alias</span></div>
       <table class="rt">
          <tr>
@@ -29877,16 +29606,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id299" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id299');"
+                           <div class="floatRight"><input id="button_usedBy_id292" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id292');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id299" style="display:block">
+                           <div id="usedBy_id292" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -29896,12 +29625,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id299" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id299');"
+                           <div class="floatRight"><input id="button_source_id292" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id292');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id299" style="display:block">
+                           <div id="source_id292" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -29921,7 +29650,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id300"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
+      </table><a id="id293"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.attlist</a></b> / @priority</span></div>
       <table class="rt">
          <tr>
@@ -29945,13 +29674,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id300" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id293" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id300');"
+                                     onclick="switchState('properties_id293');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id300" style="display:block">
+                           <div id="properties_id293" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -29966,16 +29695,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id300" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id300');"
+                           <div class="floatRight"><input id="button_usedBy_id293" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id293');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id300" style="display:block">
+                           <div id="usedBy_id293" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -29985,12 +29714,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id300" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id300');"
+                           <div class="floatRight"><input id="button_source_id293" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id293');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id300" style="display:block">
+                           <div id="source_id293" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -30010,7 +29739,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id305"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
+      </table><a id="id298"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.attlist</a></b> / @arch</span></div>
       <table class="rt">
          <tr>
@@ -30030,13 +29759,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id305" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id298" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id305');"
+                                     onclick="switchState('annotations_id298');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id305" style="display:block">
+                           <div id="annotations_id298" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -30051,16 +29780,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id305" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id305');"
+                           <div class="floatRight"><input id="button_usedBy_id298" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id298');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id305" style="display:block">
+                           <div id="usedBy_id298" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -30070,12 +29799,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id305" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id305');"
+                           <div class="floatRight"><input id="button_source_id298" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id298');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id305" style="display:block">
+                           <div id="source_id298" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -30099,7 +29828,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id306"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
+      </table><a id="id299"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.attlist</a></b> / @replaces</span></div>
       <table class="rt">
          <tr>
@@ -30119,13 +29848,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id306" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id299" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id306');"
+                                     onclick="switchState('annotations_id299');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id306" style="display:block">
+                           <div id="annotations_id299" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -30140,16 +29869,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id306" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id306');"
+                           <div class="floatRight"><input id="button_usedBy_id299" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id299');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id306" style="display:block">
+                           <div id="usedBy_id299" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -30159,12 +29888,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id306" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id306');"
+                           <div class="floatRight"><input id="button_source_id299" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id299');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id306" style="display:block">
+                           <div id="source_id299" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -30188,7 +29917,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id307"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
+      </table><a id="id300"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.attlist</a></b> / @bootdelete</span></div>
       <table class="rt">
          <tr>
@@ -30212,13 +29941,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id307" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id300" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id307');"
+                                     onclick="switchState('properties_id300');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id307" style="display:block">
+                           <div id="properties_id300" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -30233,16 +29962,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id307" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id307');"
+                           <div class="floatRight"><input id="button_usedBy_id300" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id300');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id307" style="display:block">
+                           <div id="usedBy_id300" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -30252,12 +29981,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id307" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id307');"
+                           <div class="floatRight"><input id="button_source_id300" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id300');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id307" style="display:block">
+                           <div id="source_id300" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -30277,7 +30006,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id308"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
+      </table><a id="id301"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.attlist</a></b> / @bootinclude</span></div>
       <table class="rt">
          <tr>
@@ -30301,13 +30030,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id308" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id301" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id308');"
+                                     onclick="switchState('properties_id301');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id308" style="display:block">
+                           <div id="properties_id301" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -30322,16 +30051,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id308" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id308');"
+                           <div class="floatRight"><input id="button_usedBy_id301" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id301');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id308" style="display:block">
+                           <div id="usedBy_id301" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -30341,12 +30070,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id308" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id308');"
+                           <div class="floatRight"><input id="button_source_id301" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id301');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id308" style="display:block">
+                           <div id="source_id301" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -30366,7 +30095,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id312"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id310" target="mainFrame" title="No namespace"
+      </table><a id="id305"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.attlist</a></b> / @arch</span></div>
       <table class="rt">
          <tr>
@@ -30386,13 +30115,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id312" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id305" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id312');"
+                                     onclick="switchState('annotations_id305');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id312" style="display:block">
+                           <div id="annotations_id305" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -30407,16 +30136,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id312" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id312');"
+                           <div class="floatRight"><input id="button_usedBy_id305" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id305');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id312" style="display:block">
+                           <div id="usedBy_id305" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id310" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -30426,12 +30155,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id312" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id312');"
+                           <div class="floatRight"><input id="button_source_id305" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id305');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id312" style="display:block">
+                           <div id="source_id305" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -30455,7 +30184,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id316"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id314" target="mainFrame" title="No namespace"
+      </table><a id="id309"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id307" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.attlist</a></b> / @arch</span></div>
       <table class="rt">
          <tr>
@@ -30475,13 +30204,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id316" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id309" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id316');"
+                                     onclick="switchState('annotations_id309');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id316" style="display:block">
+                           <div id="annotations_id309" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -30496,16 +30225,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id316" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id316');"
+                           <div class="floatRight"><input id="button_usedBy_id309" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id309');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id316" style="display:block">
+                           <div id="usedBy_id309" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id314" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id307" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -30515,12 +30244,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id316" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id316');"
+                           <div class="floatRight"><input id="button_source_id309" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id309');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id316" style="display:block">
+                           <div id="source_id309" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -30544,7 +30273,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id320"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id318" target="mainFrame" title="No namespace"
+      </table><a id="id313"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id311" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.attlist</a></b> / @arch</span></div>
       <table class="rt">
          <tr>
@@ -30564,13 +30293,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id320" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id313" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id320');"
+                                     onclick="switchState('annotations_id313');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id320" style="display:block">
+                           <div id="annotations_id313" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -30585,16 +30314,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id320" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id320');"
+                           <div class="floatRight"><input id="button_usedBy_id313" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id313');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id320" style="display:block">
+                           <div id="usedBy_id313" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id318" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id311" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -30604,12 +30333,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id320" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id320');"
+                           <div class="floatRight"><input id="button_source_id313" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id313');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id320" style="display:block">
+                           <div id="source_id313" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -30633,7 +30362,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id327"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id325" target="mainFrame" title="No namespace"
+      </table><a id="id320"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id318" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.attlist</a></b> / @bootinclude</span></div>
       <table class="rt">
          <tr>
@@ -30657,13 +30386,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id327" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id320" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id327');"
+                                     onclick="switchState('properties_id320');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id327" style="display:block">
+                           <div id="properties_id320" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -30678,16 +30407,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id327" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id327');"
+                           <div class="floatRight"><input id="button_usedBy_id320" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id320');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id327" style="display:block">
+                           <div id="usedBy_id320" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id325" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id318" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -30697,12 +30426,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id327" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id327');"
+                           <div class="floatRight"><input id="button_source_id320" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id320');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id327" style="display:block">
+                           <div id="source_id320" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -30722,7 +30451,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id330"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id329" target="mainFrame" title="No namespace"
+      </table><a id="id323"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id322" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.type.attribute</a></b> / @type</span></div>
       <table class="rt">
          <tr>
@@ -30746,13 +30475,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id330" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id323" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id330');"
+                                     onclick="switchState('properties_id323');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id330" style="display:block">
+                           <div id="properties_id323" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -30767,12 +30496,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id330" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id330');"
+                           <div class="floatRight"><input id="button_facets_id323" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id323');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id330" style="display:block">
+                           <div id="facets_id323" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -30865,16 +30594,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id330" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id330');"
+                           <div class="floatRight"><input id="button_usedBy_id323" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id323');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id330" style="display:block">
+                           <div id="usedBy_id323" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id329" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id322" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.type.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -30884,12 +30613,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id330" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id330');"
+                           <div class="floatRight"><input id="button_source_id323" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id323');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id330" style="display:block">
+                           <div id="source_id323" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -30926,7 +30655,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id331"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id328" target="mainFrame" title="No namespace"
+      </table><a id="id324"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.attlist</a></b> / @profiles</span></div>
       <table class="rt">
          <tr>
@@ -30946,16 +30675,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id331" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id331');"
+                           <div class="floatRight"><input id="button_usedBy_id324" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id324');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id331" style="display:block">
+                           <div id="usedBy_id324" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id328" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -30965,12 +30694,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id331" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id331');"
+                           <div class="floatRight"><input id="button_source_id324" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id324');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id331" style="display:block">
+                           <div id="source_id324" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -30990,7 +30719,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id332"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id328" target="mainFrame" title="No namespace"
+      </table><a id="id325"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.attlist</a></b> / @patternType</span></div>
       <table class="rt">
          <tr>
@@ -31014,13 +30743,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id332" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id325" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id332');"
+                                     onclick="switchState('properties_id325');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id332" style="display:block">
+                           <div id="properties_id325" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -31035,12 +30764,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id332" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id332');"
+                           <div class="floatRight"><input id="button_facets_id325" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id325');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id332" style="display:block">
+                           <div id="facets_id325" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -31063,16 +30792,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id332" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id332');"
+                           <div class="floatRight"><input id="button_usedBy_id325" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id325');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id332" style="display:block">
+                           <div id="usedBy_id325" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id328" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -31082,12 +30811,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id332" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id332');"
+                           <div class="floatRight"><input id="button_source_id325" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id325');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id332" style="display:block">
+                           <div id="source_id325" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -31114,7 +30843,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id334"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id333" target="mainFrame" title="No namespace"
+      </table><a id="id327"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id326" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.replaces.attribute</a></b> / @replaces</span></div>
       <table class="rt">
          <tr>
@@ -31134,13 +30863,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id334" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id327" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id334');"
+                                     onclick="switchState('annotations_id327');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id334" style="display:block">
+                           <div id="annotations_id327" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -31155,13 +30884,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id334" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id327" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id334');"
+                                     onclick="switchState('properties_id327');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id334" style="display:block">
+                           <div id="properties_id327" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -31176,16 +30905,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id334" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id334');"
+                           <div class="floatRight"><input id="button_usedBy_id327" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id327');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id334" style="display:block">
+                           <div id="usedBy_id327" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id333" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id326" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.replaces.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -31195,12 +30924,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id334" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id334');"
+                           <div class="floatRight"><input id="button_source_id327" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id327');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id334" style="display:block">
+                           <div id="source_id327" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -31224,7 +30953,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id336"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id335" target="mainFrame" title="No namespace"
+      </table><a id="id329"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id328" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.bootinclude.attribute</a></b> / @bootinclude</span></div>
       <table class="rt">
          <tr>
@@ -31248,13 +30977,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id336" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id329" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id336');"
+                                     onclick="switchState('properties_id329');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id336" style="display:block">
+                           <div id="properties_id329" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -31269,16 +30998,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id336" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id336');"
+                           <div class="floatRight"><input id="button_usedBy_id329" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id329');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id336" style="display:block">
+                           <div id="usedBy_id329" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id335" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id328" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.bootinclude.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -31288,12 +31017,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id336" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id336');"
+                           <div class="floatRight"><input id="button_source_id329" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id329');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id336" style="display:block">
+                           <div id="source_id329" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -31313,7 +31042,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id338"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id337" target="mainFrame" title="No namespace"
+      </table><a id="id331"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id330" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.bootdelete.attribute</a></b> / @bootdelete</span></div>
       <table class="rt">
          <tr>
@@ -31337,13 +31066,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id338" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id331" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id338');"
+                                     onclick="switchState('properties_id331');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id338" style="display:block">
+                           <div id="properties_id331" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -31358,16 +31087,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id338" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id338');"
+                           <div class="floatRight"><input id="button_usedBy_id331" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id331');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id338" style="display:block">
+                           <div id="usedBy_id331" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id337" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id330" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.bootdelete.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -31377,12 +31106,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id338" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id338');"
+                           <div class="floatRight"><input id="button_source_id331" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id331');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id338" style="display:block">
+                           <div id="source_id331" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -31402,7 +31131,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id340"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id339" target="mainFrame" title="No namespace"
+      </table><a id="id333"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id332" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.attribute</a></b> / @arch</span></div>
       <table class="rt">
          <tr>
@@ -31422,13 +31151,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id340" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id333" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id340');"
+                                     onclick="switchState('annotations_id333');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id340" style="display:block">
+                           <div id="annotations_id333" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -31443,13 +31172,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id340" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id333" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id340');"
+                                     onclick="switchState('properties_id333');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id340" style="display:block">
+                           <div id="properties_id333" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -31464,16 +31193,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id340" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id340');"
+                           <div class="floatRight"><input id="button_usedBy_id333" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id333');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id340" style="display:block">
+                           <div id="usedBy_id333" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id339" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id332" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -31483,12 +31212,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id340" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id340');"
+                           <div class="floatRight"><input id="button_source_id333" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id333');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id340" style="display:block">
+                           <div id="source_id333" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -31512,7 +31241,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id342"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id341" target="mainFrame" title="No namespace"
+      </table><a id="id335"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id334" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.attribute</a></b> / @description</span></div>
       <table class="rt">
          <tr>
@@ -31532,13 +31261,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id342" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id335" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id342');"
+                                     onclick="switchState('annotations_id335');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id342" style="display:block">
+                           <div id="annotations_id335" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -31553,13 +31282,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id342" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id335" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id342');"
+                                     onclick="switchState('properties_id335');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id342" style="display:block">
+                           <div id="properties_id335" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -31574,16 +31303,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id342" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id342');"
+                           <div class="floatRight"><input id="button_usedBy_id335" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id335');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id342" style="display:block">
+                           <div id="usedBy_id335" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id341" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id334" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -31593,12 +31322,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id342" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id342');"
+                           <div class="floatRight"><input id="button_source_id335" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id335');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id342" style="display:block">
+                           <div id="source_id335" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -31622,7 +31351,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id344"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id343" target="mainFrame" title="No namespace"
+      </table><a id="id337"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id336" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profiles.attribute</a></b> / @profiles</span></div>
       <table class="rt">
          <tr>
@@ -31642,13 +31371,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id344" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id337" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id344');"
+                                     onclick="switchState('annotations_id337');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id344" style="display:block">
+                           <div id="annotations_id337" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -31663,13 +31392,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id344" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id337" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id344');"
+                                     onclick="switchState('properties_id337');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id344" style="display:block">
+                           <div id="properties_id337" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -31684,16 +31413,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id344" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id344');"
+                           <div class="floatRight"><input id="button_usedBy_id337" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id337');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id344" style="display:block">
+                           <div id="usedBy_id337" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id343" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id336" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profiles.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -31703,12 +31432,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id344" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id344');"
+                           <div class="floatRight"><input id="button_source_id337" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id337');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id344" style="display:block">
+                           <div id="source_id337" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -31732,7 +31461,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id346"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id345" target="mainFrame" title="No namespace"
+      </table><a id="id339"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id338" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.attribute</a></b> / @size</span></div>
       <table class="rt">
          <tr>
@@ -31752,13 +31481,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id346" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id339" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id346');"
+                                     onclick="switchState('annotations_id339');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id346" style="display:block">
+                           <div id="annotations_id339" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -31778,13 +31507,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id346" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id339" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id346');"
+                                     onclick="switchState('properties_id339');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id346" style="display:block">
+                           <div id="properties_id339" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -31799,12 +31528,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id346" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id346');"
+                           <div class="floatRight"><input id="button_facets_id339" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id339');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id346" style="display:block">
+                           <div id="facets_id339" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">pattern</td>
@@ -31820,16 +31549,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id346" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id346');"
+                           <div class="floatRight"><input id="button_usedBy_id339" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id339');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id346" style="display:block">
+                           <div id="usedBy_id339" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id345" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id338" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -31839,12 +31568,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id346" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id346');"
+                           <div class="floatRight"><input id="button_source_id339" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id339');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id346" style="display:block">
+                           <div id="source_id339" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -31868,7 +31597,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id348"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id347" target="mainFrame" title="No namespace"
+      </table><a id="id341"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id340" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.username.attribute</a></b> / @username</span></div>
       <table class="rt">
          <tr>
@@ -31888,13 +31617,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id348" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id341" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id348');"
+                                     onclick="switchState('annotations_id341');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id348" style="display:block">
+                           <div id="annotations_id341" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -31909,13 +31638,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id348" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id341" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id348');"
+                                     onclick="switchState('properties_id341');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id348" style="display:block">
+                           <div id="properties_id341" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -31930,16 +31659,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id348" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id348');"
+                           <div class="floatRight"><input id="button_usedBy_id341" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id341');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id348" style="display:block">
+                           <div id="usedBy_id341" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id347" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id340" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.username.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -31949,12 +31678,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id348" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id348');"
+                           <div class="floatRight"><input id="button_source_id341" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id341');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id348" style="display:block">
+                           <div id="source_id341" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -31978,7 +31707,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id354"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id353" target="mainFrame" title="No namespace"
+      </table><a id="id347"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id346" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.local.attribute</a></b> / @local</span></div>
       <table class="rt">
          <tr>
@@ -32002,13 +31731,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id354" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id347" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id354');"
+                                     onclick="switchState('properties_id347');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id354" style="display:block">
+                           <div id="properties_id347" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -32023,16 +31752,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id354" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id354');"
+                           <div class="floatRight"><input id="button_usedBy_id347" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id347');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id354" style="display:block">
+                           <div id="usedBy_id347" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id353" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id346" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.local.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -32042,12 +31771,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id354" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id354');"
+                           <div class="floatRight"><input id="button_source_id347" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id347');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id354" style="display:block">
+                           <div id="source_id347" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -32067,7 +31796,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id360"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id359" target="mainFrame" title="No namespace"
+      </table><a id="id353"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id352" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.forcerepo.attribute</a></b> / @forcerepo</span></div>
       <table class="rt">
          <tr>
@@ -32087,13 +31816,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id360" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id353" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id360');"
+                                     onclick="switchState('annotations_id353');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id360" style="display:block">
+                           <div id="annotations_id353" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -32112,13 +31841,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id360" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id353" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id360');"
+                                     onclick="switchState('properties_id353');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id360" style="display:block">
+                           <div id="properties_id353" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -32133,16 +31862,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id360" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id360');"
+                           <div class="floatRight"><input id="button_usedBy_id353" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id353');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id360" style="display:block">
+                           <div id="usedBy_id353" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id359" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id352" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.forcerepo.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -32152,12 +31881,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id360" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id360');"
+                           <div class="floatRight"><input id="button_source_id353" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id353');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id360" style="display:block">
+                           <div id="source_id353" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -32181,7 +31910,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id362"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id361" target="mainFrame" title="No namespace"
+      </table><a id="id355"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id354" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.addarch.attribute</a></b> / @addarch</span></div>
       <table class="rt">
          <tr>
@@ -32201,13 +31930,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id362" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id355" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id362');"
+                                     onclick="switchState('properties_id355');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id362" style="display:block">
+                           <div id="properties_id355" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -32222,16 +31951,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id362" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id362');"
+                           <div class="floatRight"><input id="button_usedBy_id355" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id355');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id362" style="display:block">
+                           <div id="usedBy_id355" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id361" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id354" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.addarch.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -32241,12 +31970,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id362" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id362');"
+                           <div class="floatRight"><input id="button_source_id355" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id355');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id362" style="display:block">
+                           <div id="source_id355" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -32266,7 +31995,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id364"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id363" target="mainFrame" title="No namespace"
+      </table><a id="id357"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id356" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.removearch.attribute</a></b> / @removearch</span></div>
       <table class="rt">
          <tr>
@@ -32286,13 +32015,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id364" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id357" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id364');"
+                                     onclick="switchState('properties_id357');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id364" style="display:block">
+                           <div id="properties_id357" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -32307,16 +32036,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id364" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id364');"
+                           <div class="floatRight"><input id="button_usedBy_id357" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id357');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id364" style="display:block">
+                           <div id="usedBy_id357" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id363" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id356" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.removearch.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -32326,12 +32055,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id364" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id364');"
+                           <div class="floatRight"><input id="button_source_id357" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id357');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id364" style="display:block">
+                           <div id="source_id357" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -32351,7 +32080,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id366"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id365" target="mainFrame" title="No namespace"
+      </table><a id="id359"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id358" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.onlyarch.attribute</a></b> / @onlyarch</span></div>
       <table class="rt">
          <tr>
@@ -32371,13 +32100,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id366" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id359" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id366');"
+                                     onclick="switchState('properties_id359');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id366" style="display:block">
+                           <div id="properties_id359" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -32392,16 +32121,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id366" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id366');"
+                           <div class="floatRight"><input id="button_usedBy_id359" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id359');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id366" style="display:block">
+                           <div id="usedBy_id359" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id365" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id358" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.onlyarch.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -32411,12 +32140,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id366" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id366');"
+                           <div class="floatRight"><input id="button_source_id359" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id359');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id366" style="display:block">
+                           <div id="source_id359" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -32436,7 +32165,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id368"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id367" target="mainFrame" title="No namespace"
+      </table><a id="id361"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id360" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.medium.attribute</a></b> / @medium</span></div>
       <table class="rt">
          <tr>
@@ -32460,13 +32189,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id368" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id361" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id368');"
+                                     onclick="switchState('properties_id361');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id368" style="display:block">
+                           <div id="properties_id361" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -32481,16 +32210,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id368" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id368');"
+                           <div class="floatRight"><input id="button_usedBy_id361" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id361');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id368" style="display:block">
+                           <div id="usedBy_id361" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id367" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id360" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.medium.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -32500,12 +32229,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id368" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id368');"
+                           <div class="floatRight"><input id="button_source_id361" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id361');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id368" style="display:block">
+                           <div id="source_id361" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -32525,7 +32254,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id377"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id376" target="mainFrame" title="No namespace"
+      </table><a id="id370"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id369" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partitions.device.attribute</a></b> / @device</span></div>
       <table class="rt">
          <tr>
@@ -32545,13 +32274,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id377" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id370" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id377');"
+                                     onclick="switchState('properties_id370');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id377" style="display:block">
+                           <div id="properties_id370" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -32566,16 +32295,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id377" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id377');"
+                           <div class="floatRight"><input id="button_usedBy_id370" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id370');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id377" style="display:block">
+                           <div id="usedBy_id370" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id376" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id369" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partitions.device.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -32585,12 +32314,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id377" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id377');"
+                           <div class="floatRight"><input id="button_source_id370" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id370');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id377" style="display:block">
+                           <div id="source_id370" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -32610,7 +32339,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id380"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id379" target="mainFrame" title="No namespace"
+      </table><a id="id373"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id372" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.mountpoint.attribute</a></b> / @mountpoint</span></div>
       <table class="rt">
          <tr>
@@ -32630,13 +32359,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id380" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id373" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id380');"
+                                     onclick="switchState('annotations_id373');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id380" style="display:block">
+                           <div id="annotations_id373" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -32651,13 +32380,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id380" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id373" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id380');"
+                                     onclick="switchState('properties_id373');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id380" style="display:block">
+                           <div id="properties_id373" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -32672,16 +32401,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id380" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id380');"
+                           <div class="floatRight"><input id="button_usedBy_id373" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id373');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id380" style="display:block">
+                           <div id="usedBy_id373" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id379" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id372" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.mountpoint.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -32691,12 +32420,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id380" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id380');"
+                           <div class="floatRight"><input id="button_source_id373" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id373');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id380" style="display:block">
+                           <div id="source_id373" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -32720,7 +32449,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id382"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id381" target="mainFrame" title="No namespace"
+      </table><a id="id375"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id374" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.target.attribute</a></b> / @target</span></div>
       <table class="rt">
          <tr>
@@ -32744,13 +32473,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id382" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id375" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id382');"
+                                     onclick="switchState('properties_id375');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id382" style="display:block">
+                           <div id="properties_id375" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -32765,16 +32494,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id382" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id382');"
+                           <div class="floatRight"><input id="button_usedBy_id375" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id375');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id382" style="display:block">
+                           <div id="usedBy_id375" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id381" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id374" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.target.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -32784,12 +32513,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id382" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id382');"
+                           <div class="floatRight"><input id="button_source_id375" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id375');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id382" style="display:block">
+                           <div id="source_id375" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -32809,7 +32538,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id384"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id383" target="mainFrame" title="No namespace"
+      </table><a id="id377"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id376" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.import.attribute</a></b> / @import</span></div>
       <table class="rt">
          <tr>
@@ -32833,13 +32562,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id384" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id377" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id384');"
+                                     onclick="switchState('properties_id377');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id384" style="display:block">
+                           <div id="properties_id377" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -32854,16 +32583,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id384" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id384');"
+                           <div class="floatRight"><input id="button_usedBy_id377" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id377');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id384" style="display:block">
+                           <div id="usedBy_id377" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id383" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id376" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.import.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -32873,12 +32602,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id384" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id384');"
+                           <div class="floatRight"><input id="button_source_id377" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id377');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id384" style="display:block">
+                           <div id="source_id377" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -32898,7 +32627,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id387"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id386" target="mainFrame" title="No namespace"
+      </table><a id="id380"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id379" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.status.attribute</a></b> / @status</span></div>
       <table class="rt">
          <tr>
@@ -32922,13 +32651,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id387" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id380" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id387');"
+                                     onclick="switchState('properties_id380');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id387" style="display:block">
+                           <div id="properties_id380" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -32943,12 +32672,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id387" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id387');"
+                           <div class="floatRight"><input id="button_facets_id380" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id380');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id387" style="display:block">
+                           <div id="facets_id380" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -32971,16 +32700,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id387" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id387');"
+                           <div class="floatRight"><input id="button_usedBy_id380" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id380');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id387" style="display:block">
+                           <div id="usedBy_id380" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id386" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id379" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.status.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -32990,12 +32719,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id387" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id387');"
+                           <div class="floatRight"><input id="button_source_id380" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id380');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id387" style="display:block">
+                           <div id="source_id380" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -33022,7 +32751,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id389"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id388" target="mainFrame" title="No namespace"
+      </table><a id="id382"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id381" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.alias.attribute</a></b> / @alias</span></div>
       <table class="rt">
          <tr>
@@ -33042,13 +32771,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id389" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id382" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id389');"
+                                     onclick="switchState('properties_id382');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id389" style="display:block">
+                           <div id="properties_id382" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -33063,16 +32792,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id389" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id389');"
+                           <div class="floatRight"><input id="button_usedBy_id382" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id382');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id389" style="display:block">
+                           <div id="usedBy_id382" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id388" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id381" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.alias.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -33082,12 +32811,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id389" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id389');"
+                           <div class="floatRight"><input id="button_source_id382" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id382');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id389" style="display:block">
+                           <div id="source_id382" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -33107,7 +32836,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id391"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id390" target="mainFrame" title="No namespace"
+      </table><a id="id384"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id383" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.priority.attribute</a></b> / @priority</span></div>
       <table class="rt">
          <tr>
@@ -33131,13 +32860,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id391" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id384" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id391');"
+                                     onclick="switchState('properties_id384');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id391" style="display:block">
+                           <div id="properties_id384" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -33152,16 +32881,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id391" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id391');"
+                           <div class="floatRight"><input id="button_usedBy_id384" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id384');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id391" style="display:block">
+                           <div id="usedBy_id384" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id390" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id383" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.priority.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -33171,12 +32900,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id391" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id391');"
+                           <div class="floatRight"><input id="button_source_id384" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id384');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id391" style="display:block">
+                           <div id="source_id384" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -33196,7 +32925,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id393"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id392" target="mainFrame" title="No namespace"
+      </table><a id="id386"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id385" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.unit.attribute</a></b> / @unit</span></div>
       <table class="rt">
          <tr>
@@ -33216,13 +32945,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id393" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id386" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id393');"
+                                     onclick="switchState('annotations_id386');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id393" style="display:block">
+                           <div id="annotations_id386" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -33241,13 +32970,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id393" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id386" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id393');"
+                                     onclick="switchState('properties_id386');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id393" style="display:block">
+                           <div id="properties_id386" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -33262,12 +32991,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id393" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id393');"
+                           <div class="floatRight"><input id="button_facets_id386" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id386');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id393" style="display:block">
+                           <div id="facets_id386" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -33290,16 +33019,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id393" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id393');"
+                           <div class="floatRight"><input id="button_usedBy_id386" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id386');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id393" style="display:block">
+                           <div id="usedBy_id386" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id392" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id385" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.unit.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -33309,12 +33038,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id393" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id393');"
+                           <div class="floatRight"><input id="button_source_id386" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id386');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id393" style="display:block">
+                           <div id="source_id386" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -33344,7 +33073,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id395"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id394" target="mainFrame" title="No namespace"
+      </table><a id="id388"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id387" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.additive.attribute</a></b> / @additive</span></div>
       <table class="rt">
          <tr>
@@ -33368,13 +33097,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id395" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id388" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id395');"
+                                     onclick="switchState('properties_id388');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id395" style="display:block">
+                           <div id="properties_id388" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -33389,16 +33118,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id395" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id395');"
+                           <div class="floatRight"><input id="button_usedBy_id388" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id388');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id395" style="display:block">
+                           <div id="usedBy_id388" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id394" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id387" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.additive.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -33408,12 +33137,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id395" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id395');"
+                           <div class="floatRight"><input id="button_source_id388" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id388');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id395" style="display:block">
+                           <div id="source_id388" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -33433,7 +33162,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id397"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id396" target="mainFrame" title="No namespace"
+      </table><a id="id390"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id389" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsnocheck.attribute</a></b> / @fsnocheck</span></div>
       <table class="rt">
          <tr>
@@ -33453,13 +33182,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id397" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id390" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id397');"
+                                     onclick="switchState('annotations_id390');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id397" style="display:block">
+                           <div id="annotations_id390" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -33478,13 +33207,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id397" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id390" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id397');"
+                                     onclick="switchState('properties_id390');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id397" style="display:block">
+                           <div id="properties_id390" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -33499,16 +33228,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id397" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id397');"
+                           <div class="floatRight"><input id="button_usedBy_id390" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id390');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id397" style="display:block">
+                           <div id="usedBy_id390" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id396" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id389" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsnocheck.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -33518,12 +33247,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id397" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id397');"
+                           <div class="floatRight"><input id="button_source_id390" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id390');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id397" style="display:block">
+                           <div id="source_id390" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -33547,7 +33276,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id399"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id398" target="mainFrame" title="No namespace"
+      </table><a id="id392"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id391" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.lvm.attribute</a></b> / @lvm</span></div>
       <table class="rt">
          <tr>
@@ -33571,13 +33300,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id399" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id392" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id399');"
+                                     onclick="switchState('properties_id392');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id399" style="display:block">
+                           <div id="properties_id392" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -33592,16 +33321,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id399" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id399');"
+                           <div class="floatRight"><input id="button_usedBy_id392" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id392');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id399" style="display:block">
+                           <div id="usedBy_id392" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id398" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id391" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.lvm.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -33611,12 +33340,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id399" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id399');"
+                           <div class="floatRight"><input id="button_source_id392" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id392');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id399" style="display:block">
+                           <div id="source_id392" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -33636,7 +33365,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id401"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id400" target="mainFrame" title="No namespace"
+      </table><a id="id394"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id393" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.baseroot.attribute</a></b> / @baseroot</span></div>
       <table class="rt">
          <tr>
@@ -33656,13 +33385,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id401" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id394" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id401');"
+                                     onclick="switchState('annotations_id394');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id401" style="display:block">
+                           <div id="annotations_id394" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -33677,13 +33406,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id401" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id394" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id401');"
+                                     onclick="switchState('properties_id394');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id401" style="display:block">
+                           <div id="properties_id394" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -33698,16 +33427,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id401" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id401');"
+                           <div class="floatRight"><input id="button_usedBy_id394" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id394');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id401" style="display:block">
+                           <div id="usedBy_id394" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id400" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id393" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.baseroot.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -33717,12 +33446,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id401" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id401');"
+                           <div class="floatRight"><input id="button_source_id394" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id394');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id401" style="display:block">
+                           <div id="source_id394" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -33746,7 +33475,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id403"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id402" target="mainFrame" title="No namespace"
+      </table><a id="id396"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id395" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootprofile.attribute</a></b> / @bootprofile</span></div>
       <table class="rt">
          <tr>
@@ -33766,13 +33495,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id403" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id396" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id403');"
+                                     onclick="switchState('properties_id396');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id403" style="display:block">
+                           <div id="properties_id396" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -33787,16 +33516,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id403" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id403');"
+                           <div class="floatRight"><input id="button_usedBy_id396" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id396');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id403" style="display:block">
+                           <div id="usedBy_id396" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id402" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id395" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootprofile.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -33806,12 +33535,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id403" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id403');"
+                           <div class="floatRight"><input id="button_source_id396" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id396');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id403" style="display:block">
+                           <div id="source_id396" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -33831,7 +33560,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id405"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id404" target="mainFrame" title="No namespace"
+      </table><a id="id398"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id397" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootkernel.attribute</a></b> / @bootkernel</span></div>
       <table class="rt">
          <tr>
@@ -33851,13 +33580,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id405" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id398" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id405');"
+                                     onclick="switchState('properties_id398');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id405" style="display:block">
+                           <div id="properties_id398" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -33872,16 +33601,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id405" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id405');"
+                           <div class="floatRight"><input id="button_usedBy_id398" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id398');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id405" style="display:block">
+                           <div id="usedBy_id398" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id404" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id397" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootkernel.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -33891,12 +33620,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id405" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id405');"
+                           <div class="floatRight"><input id="button_source_id398" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id398');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id405" style="display:block">
+                           <div id="source_id398" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -33916,7 +33645,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id407"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id406" target="mainFrame" title="No namespace"
+      </table><a id="id400"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id399" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.boot.attribute</a></b> / @boot</span></div>
       <table class="rt">
          <tr>
@@ -33936,13 +33665,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id407" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id400" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id407');"
+                                     onclick="switchState('properties_id400');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id407" style="display:block">
+                           <div id="properties_id400" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -33957,16 +33686,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id407" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id407');"
+                           <div class="floatRight"><input id="button_usedBy_id400" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id400');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id407" style="display:block">
+                           <div id="usedBy_id400" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id406" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id399" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.boot.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -33976,12 +33705,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id407" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id407');"
+                           <div class="floatRight"><input id="button_source_id400" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id400');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id407" style="display:block">
+                           <div id="source_id400" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -34001,7 +33730,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id409"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id408" target="mainFrame" title="No namespace"
+      </table><a id="id402"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id401" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.checkprebuilt.attribute</a></b> / @checkprebuilt</span></div>
       <table class="rt">
          <tr>
@@ -34025,13 +33754,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id409" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id402" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id409');"
+                                     onclick="switchState('properties_id402');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id409" style="display:block">
+                           <div id="properties_id402" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -34046,16 +33775,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id409" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id409');"
+                           <div class="floatRight"><input id="button_usedBy_id402" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id402');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id409" style="display:block">
+                           <div id="usedBy_id402" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id408" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id401" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.checkprebuilt.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -34065,12 +33794,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id409" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id409');"
+                           <div class="floatRight"><input id="button_source_id402" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id402');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id409" style="display:block">
+                           <div id="source_id402" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -34090,7 +33819,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id411"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id410" target="mainFrame" title="No namespace"
+      </table><a id="id404"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id403" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.volid.attribute</a></b> / @volid</span></div>
       <table class="rt">
          <tr>
@@ -34110,13 +33839,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id411" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id404" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id411');"
+                                     onclick="switchState('properties_id404');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id411" style="display:block">
+                           <div id="properties_id404" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -34131,16 +33860,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id411" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id411');"
+                           <div class="floatRight"><input id="button_usedBy_id404" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id404');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id411" style="display:block">
+                           <div id="usedBy_id404" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id410" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id403" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.volid.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -34150,12 +33879,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id411" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id411');"
+                           <div class="floatRight"><input id="button_source_id404" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id404');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id411" style="display:block">
+                           <div id="source_id404" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -34175,7 +33904,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id413"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id412" target="mainFrame" title="No namespace"
+      </table><a id="id406"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id405" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.flags.attribute</a></b> / @flags</span></div>
       <table class="rt">
          <tr>
@@ -34199,13 +33928,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id413" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id406" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id413');"
+                                     onclick="switchState('properties_id406');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id413" style="display:block">
+                           <div id="properties_id406" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -34220,12 +33949,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id413" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id413');"
+                           <div class="floatRight"><input id="button_facets_id406" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id406');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id413" style="display:block">
+                           <div id="facets_id406" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -34255,16 +33984,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id413" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id413');"
+                           <div class="floatRight"><input id="button_usedBy_id406" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id406');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id413" style="display:block">
+                           <div id="usedBy_id406" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id412" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id405" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.flags.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -34274,12 +34003,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id413" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id413');"
+                           <div class="floatRight"><input id="button_source_id406" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id406');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id413" style="display:block">
+                           <div id="source_id406" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -34307,7 +34036,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id415"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id414" target="mainFrame" title="No namespace"
+      </table><a id="id408"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id407" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.hybrid.attribute</a></b> / @hybrid</span></div>
       <table class="rt">
          <tr>
@@ -34331,13 +34060,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id415" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id408" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id415');"
+                                     onclick="switchState('properties_id408');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id415" style="display:block">
+                           <div id="properties_id408" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -34352,16 +34081,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id415" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id415');"
+                           <div class="floatRight"><input id="button_usedBy_id408" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id408');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id415" style="display:block">
+                           <div id="usedBy_id408" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id414" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id407" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.hybrid.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -34371,12 +34100,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id415" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id415');"
+                           <div class="floatRight"><input id="button_source_id408" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id408');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id415" style="display:block">
+                           <div id="source_id408" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -34396,7 +34125,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id417"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id416" target="mainFrame" title="No namespace"
+      </table><a id="id410"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id409" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.hybridpersistent.attribute</a></b> / @hybridpersistent</span></div>
       <table class="rt">
          <tr>
@@ -34420,13 +34149,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id417" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id410" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id417');"
+                                     onclick="switchState('properties_id410');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id417" style="display:block">
+                           <div id="properties_id410" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -34441,16 +34170,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id417" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id417');"
+                           <div class="floatRight"><input id="button_usedBy_id410" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id410');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id417" style="display:block">
+                           <div id="usedBy_id410" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id416" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id409" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.hybridpersistent.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -34460,12 +34189,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id417" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id417');"
+                           <div class="floatRight"><input id="button_source_id410" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id410');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id417" style="display:block">
+                           <div id="source_id410" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -34485,7 +34214,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id419"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id418" target="mainFrame" title="No namespace"
+      </table><a id="id412"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id411" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootloader.attribute</a></b> / @bootloader</span></div>
       <table class="rt">
          <tr>
@@ -34509,13 +34238,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id419" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id412" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id419');"
+                                     onclick="switchState('properties_id412');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id419" style="display:block">
+                           <div id="properties_id412" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -34530,12 +34259,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id419" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id419');"
+                           <div class="floatRight"><input id="button_facets_id412" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id412');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id419" style="display:block">
+                           <div id="facets_id412" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -34558,6 +34287,13 @@
                                        <div class="annotation"></div>
                                     </td>
                                  </tr>
+                                 <tr>
+                                    <td class="firstColumn">enumeration</td>
+                                    <td width="30%"><b>zipl</b></td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
                               </table>
                            </div>
                         </td>
@@ -34565,16 +34301,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id419" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id419');"
+                           <div class="floatRight"><input id="button_usedBy_id412" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id412');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id419" style="display:block">
+                           <div id="usedBy_id412" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id418" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id411" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootloader.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -34584,12 +34320,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id419" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id419');"
+                           <div class="floatRight"><input id="button_source_id412" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id412');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id419" style="display:block">
+                           <div id="source_id412" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -34599,6 +34335,7 @@
       </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"extlinux"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"grub"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"syslinux"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"zipl"</span><span class="tokenElement">/></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
@@ -34617,7 +34354,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id421"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id420" target="mainFrame" title="No namespace"
+      </table><a id="id414"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id413" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.compressed.attribute</a></b> / @compressed</span></div>
       <table class="rt">
          <tr>
@@ -34641,13 +34378,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id421" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id414" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id421');"
+                                     onclick="switchState('properties_id414');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id421" style="display:block">
+                           <div id="properties_id414" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -34662,16 +34399,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id421" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id421');"
+                           <div class="floatRight"><input id="button_usedBy_id414" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id414');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id421" style="display:block">
+                           <div id="usedBy_id414" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id420" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id413" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.compressed.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -34681,12 +34418,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id421" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id421');"
+                           <div class="floatRight"><input id="button_source_id414" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id414');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id421" style="display:block">
+                           <div id="source_id414" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -34706,7 +34443,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id423"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id422" target="mainFrame" title="No namespace"
+      </table><a id="id416"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id415" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.vga.attribute</a></b> / @vga</span></div>
       <table class="rt">
          <tr>
@@ -34726,13 +34463,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id423" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id416" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id423');"
+                                     onclick="switchState('properties_id416');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id423" style="display:block">
+                           <div id="properties_id416" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -34747,16 +34484,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id423" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id423');"
+                           <div class="floatRight"><input id="button_usedBy_id416" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id416');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id423" style="display:block">
+                           <div id="usedBy_id416" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id422" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id415" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.vga.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -34766,12 +34503,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id423" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id423');"
+                           <div class="floatRight"><input id="button_source_id416" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id416');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id423" style="display:block">
+                           <div id="source_id416" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -34791,7 +34528,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id425"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id424" target="mainFrame" title="No namespace"
+      </table><a id="id418"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id417" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.luks.attribute</a></b> / @luks</span></div>
       <table class="rt">
          <tr>
@@ -34811,13 +34548,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id425" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id418" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id425');"
+                                     onclick="switchState('properties_id418');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id425" style="display:block">
+                           <div id="properties_id418" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -34832,16 +34569,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id425" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id425');"
+                           <div class="floatRight"><input id="button_usedBy_id418" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id418');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id425" style="display:block">
+                           <div id="usedBy_id418" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id424" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id417" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.luks.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -34851,12 +34588,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id425" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id425');"
+                           <div class="floatRight"><input id="button_source_id418" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id418');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id425" style="display:block">
+                           <div id="source_id418" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -34876,7 +34613,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id427"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id426" target="mainFrame" title="No namespace"
+      </table><a id="id420"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id419" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.filesystem.attribute</a></b> / @filesystem</span></div>
       <table class="rt">
          <tr>
@@ -34900,13 +34637,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id427" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id420" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id427');"
+                                     onclick="switchState('properties_id420');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id427" style="display:block">
+                           <div id="properties_id420" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -34921,12 +34658,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id427" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id427');"
+                           <div class="floatRight"><input id="button_facets_id420" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id420');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id427" style="display:block">
+                           <div id="facets_id420" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -34977,16 +34714,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id427" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id427');"
+                           <div class="floatRight"><input id="button_usedBy_id420" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id420');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id427" style="display:block">
+                           <div id="usedBy_id420" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id426" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id419" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.filesystem.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -34996,12 +34733,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id427" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id427');"
+                           <div class="floatRight"><input id="button_source_id420" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id420');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id427" style="display:block">
+                           <div id="source_id420" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -35032,7 +34769,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id429"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id428" target="mainFrame" title="No namespace"
+      </table><a id="id422"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id421" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsreadonly.attribute</a></b> / @fsreadonly</span></div>
       <table class="rt">
          <tr>
@@ -35052,13 +34789,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id429" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id422" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id429');"
+                                     onclick="switchState('annotations_id422');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id429" style="display:block">
+                           <div id="annotations_id422" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -35077,13 +34814,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id429" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id422" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id429');"
+                                     onclick="switchState('properties_id422');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id429" style="display:block">
+                           <div id="properties_id422" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -35098,12 +34835,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id429" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id429');"
+                           <div class="floatRight"><input id="button_facets_id422" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id422');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id429" style="display:block">
+                           <div id="facets_id422" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -35147,16 +34884,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id429" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id429');"
+                           <div class="floatRight"><input id="button_usedBy_id422" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id422');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id429" style="display:block">
+                           <div id="usedBy_id422" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id428" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id421" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsreadonly.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -35166,12 +34903,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id429" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id429');"
+                           <div class="floatRight"><input id="button_source_id422" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id422');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id429" style="display:block">
+                           <div id="source_id422" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -35204,7 +34941,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id431"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id430" target="mainFrame" title="No namespace"
+      </table><a id="id424"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id423" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsreadwrite.attribute</a></b> / @fsreadwrite</span></div>
       <table class="rt">
          <tr>
@@ -35224,13 +34961,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id431" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id424" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id431');"
+                                     onclick="switchState('annotations_id424');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id431" style="display:block">
+                           <div id="annotations_id424" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -35249,13 +34986,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id431" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id424" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id431');"
+                                     onclick="switchState('properties_id424');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id431" style="display:block">
+                           <div id="properties_id424" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -35270,12 +35007,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id431" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id431');"
+                           <div class="floatRight"><input id="button_facets_id424" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id424');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id431" style="display:block">
+                           <div id="facets_id424" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -35312,16 +35049,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id431" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id431');"
+                           <div class="floatRight"><input id="button_usedBy_id424" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id424');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id431" style="display:block">
+                           <div id="usedBy_id424" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id430" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id423" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsreadwrite.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -35331,12 +35068,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id431" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id431');"
+                           <div class="floatRight"><input id="button_source_id424" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id424');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id431" style="display:block">
+                           <div id="source_id424" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -35368,7 +35105,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id433"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id432" target="mainFrame" title="No namespace"
+      </table><a id="id426"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id425" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.format.attribute</a></b> / @format</span></div>
       <table class="rt">
          <tr>
@@ -35386,19 +35123,40 @@
                         <td>No namespace</td>
                      </tr>
                      <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Annotations</b></div>
+                           <div class="floatRight"><input id="button_annotations_id426" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('annotations_id426');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="annotations_id426" style="display:block">
+                              <div class="annotation">
+                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                        class="preWrapContainer">
+                                    <tr>
+                                       <td width="100%"><pre><span class="tokenText">Specifies the format of the virtual disk.</span></pre></td>
+                                    </tr>
+                                 </table>
+                              </div>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
                         <td class="firstColumn"><b>Type</b></td>
                         <td>restriction of <b>xs:token</b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id433" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id426" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id433');"
+                                     onclick="switchState('properties_id426');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id433" style="display:block">
+                           <div id="properties_id426" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -35413,96 +35171,268 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id433" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id433');"
+                           <div class="floatRight"><input id="button_facets_id426" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id426');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id433" style="display:block">
+                           <div id="facets_id426" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>bochs</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>cloop</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>cow</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>dmg</b></td>
+                                    <td width="30%"><b>ovf</b></td>
                                     <td>
                                        <div class="annotation"></div>
                                     </td>
                                  </tr>
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>iso</b></td>
+                                    <td width="30%"><b>qcow2</b></td>
                                     <td>
                                        <div class="annotation"></div>
                                     </td>
                                  </tr>
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>ovf</b></td>
+                                    <td width="30%"><b>vmdk</b></td>
                                     <td>
                                        <div class="annotation"></div>
                                     </td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Used by</b></div>
+                           <div class="floatRight"><input id="button_usedBy_id426" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id426');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="usedBy_id426" style="display:block">
+                              <table class="usedByTable">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>qcow</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
+                                    <td class="firstColumn">Attribute Group </td>
+                                    <td><b><a href="kiwi0.html#id425" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.format.attribute</a></b></td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id426" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id426');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="source_id426" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>qcow2</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"format"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Specifies the format of the virtual disk.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ovf"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"qcow2"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vmdk"</span><span class="tokenElement">/></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
+</span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id428"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id427" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.installiso.attribute</a></b> / @installiso</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>No namespace</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Annotations</b></div>
+                           <div class="floatRight"><input id="button_annotations_id428" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('annotations_id428');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="annotations_id428" style="display:block">
+                              <div class="annotation">
+                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                        class="preWrapContainer">
+                                    <tr>
+                                       <td width="100%"><pre><span class="tokenText">Specifies if a install iso should be created (oem only)</span></pre></td>
+                                    </tr>
+                                 </table>
+                              </div>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td><b>xs:boolean</b></td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Properties</b></div>
+                           <div class="floatRight"><input id="button_properties_id428" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('properties_id428');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="properties_id428" style="display:block">
+                              <table class="propertiesTable">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>usb</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
+                                    <td class="firstColumn">use:
+                                       
                                     </td>
+                                    <td><b>required</b></td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Used by</b></div>
+                           <div class="floatRight"><input id="button_usedBy_id428" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id428');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="usedBy_id428" style="display:block">
+                              <table class="usedByTable">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>vmdk</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
+                                    <td class="firstColumn">Attribute Group </td>
+                                    <td><b><a href="kiwi0.html#id427" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.installiso.attribute</a></b></td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id428" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id428');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="source_id428" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>vpc</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"installiso"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Specifies if a install iso should be created (oem only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+</span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id430"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id429" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.installstick.attribute</a></b> / @installstick</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>No namespace</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Annotations</b></div>
+                           <div class="floatRight"><input id="button_annotations_id430" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('annotations_id430');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="annotations_id430" style="display:block">
+                              <div class="annotation">
+                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                        class="preWrapContainer">
+                                    <tr>
+                                       <td width="100%"><pre><span class="tokenText">Specifies if a install stick should be created (oem only)</span></pre></td>
+                                    </tr>
+                                 </table>
+                              </div>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td><b>xs:boolean</b></td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Properties</b></div>
+                           <div class="floatRight"><input id="button_properties_id430" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('properties_id430');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="properties_id430" style="display:block">
+                              <table class="propertiesTable">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>vvfat</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
+                                    <td class="firstColumn">use:
+                                       
                                     </td>
+                                    <td><b>required</b></td>
                                  </tr>
                               </table>
                            </div>
@@ -35511,17 +35441,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id433" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id433');"
+                           <div class="floatRight"><input id="button_usedBy_id430" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id430');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id433" style="display:block">
+                           <div id="usedBy_id430" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id432" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.format.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id429" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.installstick.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -35530,32 +35460,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id433" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id433');"
+                           <div class="floatRight"><input id="button_source_id430" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id430');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id433" style="display:block">
+                           <div id="source_id430" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"format"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"bochs"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"cloop"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"cow"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"dmg"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"iso"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ovf"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"qcow"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"qcow2"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"usb"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vmdk"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vpc"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vvfat"</span><span class="tokenElement">/></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"installstick"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Specifies if a install stick should be created (oem only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
                               </table>
@@ -35572,7 +35489,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id435"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id434" target="mainFrame" title="No namespace"
+      </table><a id="id432"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id431" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.primary.attribute</a></b> / @primary</span></div>
       <table class="rt">
          <tr>
@@ -35592,13 +35509,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id435" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id432" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id435');"
+                                     onclick="switchState('annotations_id432');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id435" style="display:block">
+                           <div id="annotations_id432" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -35617,13 +35534,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id435" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id432" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id435');"
+                                     onclick="switchState('properties_id432');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id435" style="display:block">
+                           <div id="properties_id432" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -35638,16 +35555,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id435" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id435');"
+                           <div class="floatRight"><input id="button_usedBy_id432" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id432');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id435" style="display:block">
+                           <div id="usedBy_id432" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id434" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id431" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.primary.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -35657,12 +35574,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id435" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id435');"
+                           <div class="floatRight"><input id="button_source_id432" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id432');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id435" style="display:block">
+                           <div id="source_id432" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -35686,7 +35603,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id437"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id436" target="mainFrame" title="No namespace"
+      </table><a id="id434"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id433" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.kernelcmdline.attribute</a></b> / @kernelcmdline</span></div>
       <table class="rt">
          <tr>
@@ -35706,13 +35623,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id437" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id434" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id437');"
+                                     onclick="switchState('properties_id434');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id437" style="display:block">
+                           <div id="properties_id434" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -35727,16 +35644,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id437" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id437');"
+                           <div class="floatRight"><input id="button_usedBy_id434" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id434');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id437" style="display:block">
+                           <div id="usedBy_id434" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id436" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id433" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.kernelcmdline.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -35746,12 +35663,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id437" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id437');"
+                           <div class="floatRight"><input id="button_source_id434" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id434');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id437" style="display:block">
+                           <div id="source_id434" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -35771,7 +35688,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id439"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id438" target="mainFrame" title="No namespace"
+      </table><a id="id436"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id435" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.freespace.attribute</a></b> / @freespace</span></div>
       <table class="rt">
          <tr>
@@ -35796,13 +35713,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id439" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id436" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id439');"
+                                     onclick="switchState('properties_id436');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id439" style="display:block">
+                           <div id="properties_id436" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -35817,12 +35734,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id439" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id439');"
+                           <div class="floatRight"><input id="button_facets_id436" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id436');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id439" style="display:block">
+                           <div id="facets_id436" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">pattern</td>
@@ -35838,16 +35755,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id439" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id439');"
+                           <div class="floatRight"><input id="button_usedBy_id436" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id436');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id439" style="display:block">
+                           <div id="usedBy_id436" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id438" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id435" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.freespace.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -35857,12 +35774,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id439" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id439');"
+                           <div class="floatRight"><input id="button_source_id436" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id436');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id439" style="display:block">
+                           <div id="source_id436" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -35882,7 +35799,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id441"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id440" target="mainFrame" title="No namespace"
+      </table><a id="id438"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id437" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.size.attribute</a></b> / @size</span></div>
       <table class="rt">
          <tr>
@@ -35907,13 +35824,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id441" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id438" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id441');"
+                                     onclick="switchState('properties_id438');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id441" style="display:block">
+                           <div id="properties_id438" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -35928,12 +35845,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id441" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id441');"
+                           <div class="floatRight"><input id="button_facets_id438" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id438');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id441" style="display:block">
+                           <div id="facets_id438" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">pattern</td>
@@ -35949,16 +35866,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id441" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id441');"
+                           <div class="floatRight"><input id="button_usedBy_id438" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id438');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id441" style="display:block">
+                           <div id="usedBy_id438" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id440" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id437" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.size.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -35968,12 +35885,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id441" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id441');"
+                           <div class="floatRight"><input id="button_source_id438" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id438');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id441" style="display:block">
+                           <div id="source_id438" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -35993,7 +35910,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id443"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id442" target="mainFrame" title="No namespace"
+      </table><a id="id440"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id439" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.lvmvolumes.lvmgroup.attribute</a></b> / @lvmgroup</span></div>
       <table class="rt">
          <tr>
@@ -36013,13 +35930,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id443" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id440" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id443');"
+                                     onclick="switchState('annotations_id440');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id443" style="display:block">
+                           <div id="annotations_id440" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -36034,13 +35951,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id443" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id440" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id443');"
+                                     onclick="switchState('properties_id440');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id443" style="display:block">
+                           <div id="properties_id440" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -36055,16 +35972,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id443" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id443');"
+                           <div class="floatRight"><input id="button_usedBy_id440" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id440');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id443" style="display:block">
+                           <div id="usedBy_id440" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id442" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id439" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.lvmvolumes.lvmgroup.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -36074,12 +35991,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id443" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id443');"
+                           <div class="floatRight"><input id="button_source_id440" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id440');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id443" style="display:block">
+                           <div id="source_id440" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -36103,7 +36020,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id445"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id444" target="mainFrame" title="No namespace"
+      </table><a id="id442"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id441" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.id.attribute</a></b> / @id</span></div>
       <table class="rt">
          <tr>
@@ -36123,13 +36040,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id445" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id442" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id445');"
+                                     onclick="switchState('annotations_id442');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id445" style="display:block">
+                           <div id="annotations_id442" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -36148,13 +36065,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id445" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id442" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id445');"
+                                     onclick="switchState('properties_id442');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id445" style="display:block">
+                           <div id="properties_id442" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -36169,16 +36086,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id445" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id445');"
+                           <div class="floatRight"><input id="button_usedBy_id442" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id442');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id445" style="display:block">
+                           <div id="usedBy_id442" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id444" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id441" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.id.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -36188,12 +36105,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id445" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id445');"
+                           <div class="floatRight"><input id="button_source_id442" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id442');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id445" style="display:block">
+                           <div id="source_id442" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -36217,7 +36134,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id447"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id446" target="mainFrame" title="No namespace"
+      </table><a id="id444"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id443" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.realname.attribute</a></b> / @realname</span></div>
       <table class="rt">
          <tr>
@@ -36237,13 +36154,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id447" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id444" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id447');"
+                                     onclick="switchState('annotations_id444');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id447" style="display:block">
+                           <div id="annotations_id444" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -36258,13 +36175,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id447" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id444" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id447');"
+                                     onclick="switchState('properties_id444');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id447" style="display:block">
+                           <div id="properties_id444" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -36279,16 +36196,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id447" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id447');"
+                           <div class="floatRight"><input id="button_usedBy_id444" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id444');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id447" style="display:block">
+                           <div id="usedBy_id444" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id446" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id443" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.realname.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -36298,12 +36215,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id447" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id447');"
+                           <div class="floatRight"><input id="button_source_id444" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id444');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id447" style="display:block">
+                           <div id="source_id444" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -36327,7 +36244,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id449"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id448" target="mainFrame" title="No namespace"
+      </table><a id="id446"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id445" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.pwdformat</a></b> / @pwdformat</span></div>
       <table class="rt">
          <tr>
@@ -36347,13 +36264,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id449" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id446" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id449');"
+                                     onclick="switchState('annotations_id446');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id449" style="display:block">
+                           <div id="annotations_id446" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -36372,13 +36289,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id449" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id446" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id449');"
+                                     onclick="switchState('properties_id446');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id449" style="display:block">
+                           <div id="properties_id446" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -36393,12 +36310,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id449" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id449');"
+                           <div class="floatRight"><input id="button_facets_id446" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id446');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id449" style="display:block">
+                           <div id="facets_id446" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -36421,16 +36338,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id449" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id449');"
+                           <div class="floatRight"><input id="button_usedBy_id446" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id446');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id449" style="display:block">
+                           <div id="usedBy_id446" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id448" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id445" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.pwdformat</a></b></td>
                                  </tr>
                               </table>
@@ -36440,12 +36357,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id449" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id449');"
+                           <div class="floatRight"><input id="button_source_id446" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id446');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id449" style="display:block">
+                           <div id="source_id446" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -36475,7 +36392,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id451"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id450" target="mainFrame" title="No namespace"
+      </table><a id="id448"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id447" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.shell.attribute</a></b> / @shell</span></div>
       <table class="rt">
          <tr>
@@ -36495,13 +36412,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id451" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id448" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id451');"
+                                     onclick="switchState('annotations_id448');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id451" style="display:block">
+                           <div id="annotations_id448" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -36516,13 +36433,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id451" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id448" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id451');"
+                                     onclick="switchState('properties_id448');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id451" style="display:block">
+                           <div id="properties_id448" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -36537,16 +36454,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id451" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id451');"
+                           <div class="floatRight"><input id="button_usedBy_id448" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id448');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id451" style="display:block">
+                           <div id="usedBy_id448" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id450" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id447" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.shell.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -36556,12 +36473,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id451" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id451');"
+                           <div class="floatRight"><input id="button_source_id448" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id448');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id451" style="display:block">
+                           <div id="source_id448" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -36585,8 +36502,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id453"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id452" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.mac.attribute</a></b> / @mac</span></div>
+      </table><a id="id450"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id449" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.driver.attribute</a></b> / @driver</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -36605,18 +36522,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id453" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id450" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id453');"
+                                     onclick="switchState('annotations_id450');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id453" style="display:block">
+                           <div id="annotations_id450" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The Mac address to assign to the virtual interface</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The driver used for the VM network interface</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -36626,13 +36543,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id453" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id450" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id453');"
+                                     onclick="switchState('properties_id450');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id453" style="display:block">
+                           <div id="properties_id450" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -36647,17 +36564,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id453" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id453');"
+                           <div class="floatRight"><input id="button_usedBy_id450" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id450');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id453" style="display:block">
+                           <div id="usedBy_id450" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id452" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.mac.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id449" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.driver.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -36666,18 +36583,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id453" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id453');"
+                           <div class="floatRight"><input id="button_source_id450" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id450');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id453" style="display:block">
+                           <div id="source_id450" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mac"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"driver"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The Mac address to assign to the virtual interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The driver used for the VM network interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -36695,8 +36612,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id455"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id454" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.server.attribute</a></b> / @server</span></div>
+      </table><a id="id452"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id451" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.mode.attribute</a></b> / @mode</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -36715,18 +36632,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id455" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id452" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id455');"
+                                     onclick="switchState('annotations_id452');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id455" style="display:block">
+                           <div id="annotations_id452" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">Name or IP Address of server for downloading the data</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The VM network mode</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -36736,13 +36653,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id455" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id452" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id455');"
+                                     onclick="switchState('properties_id452');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id455" style="display:block">
+                           <div id="properties_id452" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -36757,17 +36674,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id455" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id455');"
+                           <div class="floatRight"><input id="button_usedBy_id452" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id452');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id455" style="display:block">
+                           <div id="usedBy_id452" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id454" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.server.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id451" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.mode.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -36776,18 +36693,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id455" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id455');"
+                           <div class="floatRight"><input id="button_source_id452" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id452');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id455" style="display:block">
+                           <div id="source_id452" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"server"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mode"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Name or IP Address of server for downloading the data</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VM network mode</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -36805,8 +36722,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id457"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id456" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.blocksize.attribute</a></b> / @blocksize</span></div>
+      </table><a id="id454"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id453" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.mac.attribute</a></b> / @mac</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -36825,18 +36742,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id457" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id454" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id457');"
+                                     onclick="switchState('annotations_id454');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id457" style="display:block">
+                           <div id="annotations_id454" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">Blocksize value used for atftp downloads</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The VM mac address</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -36844,19 +36761,125 @@
                         </td>
                      </tr>
                      <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:nonNegativeInteger</b></td>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Properties</b></div>
+                           <div class="floatRight"><input id="button_properties_id454" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('properties_id454');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="properties_id454" style="display:block">
+                              <table class="propertiesTable">
+                                 <tr>
+                                    <td class="firstColumn">use:
+                                       
+                                    </td>
+                                    <td><b>required</b></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Used by</b></div>
+                           <div class="floatRight"><input id="button_usedBy_id454" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id454');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="usedBy_id454" style="display:block">
+                              <table class="usedByTable">
+                                 <tr>
+                                    <td class="firstColumn">Attribute Group </td>
+                                    <td><b><a href="kiwi0.html#id453" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.mac.attribute</a></b></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id454" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id454');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="source_id454" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
+                                 <tr>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mac"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VM mac address</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+</span><span class="tokenElement"></xs:attribute></span></pre></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id456"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id455" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.device.attribute</a></b> / @device</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>No namespace</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Annotations</b></div>
+                           <div class="floatRight"><input id="button_annotations_id456" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('annotations_id456');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="annotations_id456" style="display:block">
+                              <div class="annotation">
+                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                        class="preWrapContainer">
+                                    <tr>
+                                       <td width="100%"><pre><span class="tokenText">The disk device to appear in the guest (xen only)</span></pre></td>
+                                    </tr>
+                                 </table>
+                              </div>
+                           </div>
+                        </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id457" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id456" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id457');"
+                                     onclick="switchState('properties_id456');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id457" style="display:block">
+                           <div id="properties_id456" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -36871,17 +36894,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id457" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id457');"
+                           <div class="floatRight"><input id="button_usedBy_id456" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id456');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id457" style="display:block">
+                           <div id="usedBy_id456" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id456" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.blocksize.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id455" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.device.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -36890,18 +36913,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id457" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id457');"
+                           <div class="floatRight"><input id="button_source_id456" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id456');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id457" style="display:block">
+                           <div id="source_id456" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"blocksize"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:nonNegativeInteger"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"device"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Blocksize value used for atftp downloads</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk device to appear in the guest (xen only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -36919,8 +36942,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id460"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id459" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.fallback.attribute</a></b> / @fallback</span></div>
+      </table><a id="id458"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id457" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.server.attribute</a></b> / @server</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -36937,19 +36960,36 @@
                         <td>No namespace</td>
                      </tr>
                      <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:IDREF</b></td>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Annotations</b></div>
+                           <div class="floatRight"><input id="button_annotations_id458" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('annotations_id458');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="annotations_id458" style="display:block">
+                              <div class="annotation">
+                                 <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                        class="preWrapContainer">
+                                    <tr>
+                                       <td width="100%"><pre><span class="tokenText">Name or IP Address of server for downloading the data</span></pre></td>
+                                    </tr>
+                                 </table>
+                              </div>
+                           </div>
+                        </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id460" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id458" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id460');"
+                                     onclick="switchState('properties_id458');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id460" style="display:block">
+                           <div id="properties_id458" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -36964,17 +37004,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id460" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id460');"
+                           <div class="floatRight"><input id="button_usedBy_id458" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id458');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id460" style="display:block">
+                           <div id="usedBy_id458" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id459" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.fallback.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id457" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.server.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -36983,16 +37023,20 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id460" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id460');"
+                           <div class="floatRight"><input id="button_source_id458" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id458');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id460" style="display:block">
+                           <div id="source_id458" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"fallback"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:IDREF"</span><span class="tokenElement">/></span></pre></td>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"server"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Name or IP Address of server for downloading the data</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+</span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
                               </table>
                            </div>
@@ -37008,8 +37052,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id462"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id461" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.arch.attribute</a></b> / @arch</span></div>
+      </table><a id="id460"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id459" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.blocksize.attribute</a></b> / @blocksize</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -37028,18 +37072,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id462" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id460" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id462');"
+                                     onclick="switchState('annotations_id460');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id462" style="display:block">
+                           <div id="annotations_id460" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">the VMware architecture type</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">Blocksize value used for atftp downloads</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -37048,18 +37092,18 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td>restriction of <b>xs:token</b></td>
+                        <td><b>xs:nonNegativeInteger</b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id462" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id460" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id462');"
+                                     onclick="switchState('properties_id460');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id462" style="display:block">
+                           <div id="properties_id460" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -37073,34 +37117,92 @@
                      </tr>
                      <tr>
                         <td class="firstColumn">
-                           <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id462" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id462');"
+                           <div class="floatLeft"><b>Used by</b></div>
+                           <div class="floatRight"><input id="button_usedBy_id460" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id460');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id462" style="display:block">
-                              <table class="facetsTable">
+                           <div id="usedBy_id460" style="display:block">
+                              <table class="usedByTable">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>ix86</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
+                                    <td class="firstColumn">Attribute Group </td>
+                                    <td><b><a href="kiwi0.html#id459" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.blocksize.attribute</a></b></td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id460" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id460');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="source_id460" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>x86_64</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
-                                    </td>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"blocksize"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:nonNegativeInteger"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Blocksize value used for atftp downloads</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+</span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id463"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id462" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.fallback.attribute</a></b> / @fallback</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>No namespace</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td><b>xs:IDREF</b></td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Properties</b></div>
+                           <div class="floatRight"><input id="button_properties_id463" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('properties_id463');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="properties_id463" style="display:block">
+                              <table class="propertiesTable">
                                  <tr>
-                                    <td class="firstColumn">enumeration</td>
-                                    <td width="30%"><b>%arch</b></td>
-                                    <td>
-                                       <div class="annotation"></div>
+                                    <td class="firstColumn">use:
+                                       
                                     </td>
+                                    <td><b>required</b></td>
                                  </tr>
                               </table>
                            </div>
@@ -37109,17 +37211,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id462" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id462');"
+                           <div class="floatRight"><input id="button_usedBy_id463" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id463');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id462" style="display:block">
+                           <div id="usedBy_id463" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id461" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.arch.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id462" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.fallback.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -37128,27 +37230,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id462" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id462');"
+                           <div class="floatRight"><input id="button_source_id463" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id463');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id462" style="display:block">
+                           <div id="source_id463" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"arch"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the VMware architecture type</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ix86"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"x86_64"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"%arch"</span><span class="tokenElement">/></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
-</span><span class="tokenElement"></xs:attribute></span></pre></td>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"fallback"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:IDREF"</span><span class="tokenElement">/></span></pre></td>
                                  </tr>
                               </table>
                            </div>
@@ -37164,8 +37255,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id464"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id463" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.HWversion.attribute</a></b> / @HWversion</span></div>
+      </table><a id="id465"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id464" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.arch.attribute</a></b> / @arch</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -37184,18 +37275,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id464" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id465" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id464');"
+                                     onclick="switchState('annotations_id465');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id464" style="display:block">
+                           <div id="annotations_id465" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The virtual HW version number for the VMware configuration</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">the VM architecture type</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -37204,18 +37295,18 @@
                      </tr>
                      <tr>
                         <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:integer</b></td>
+                        <td>restriction of <b>xs:token</b></td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id464" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id465" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id464');"
+                                     onclick="switchState('properties_id465');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id464" style="display:block">
+                           <div id="properties_id465" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -37229,18 +37320,53 @@
                      </tr>
                      <tr>
                         <td class="firstColumn">
+                           <div class="floatLeft"><b>Facets</b></div>
+                           <div class="floatRight"><input id="button_facets_id465" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id465');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="facets_id465" style="display:block">
+                              <table class="facetsTable">
+                                 <tr>
+                                    <td class="firstColumn">enumeration</td>
+                                    <td width="30%"><b>ix86</b></td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="firstColumn">enumeration</td>
+                                    <td width="30%"><b>x86_64</b></td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="firstColumn">enumeration</td>
+                                    <td width="30%"><b>%arch</b></td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id464" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id464');"
+                           <div class="floatRight"><input id="button_usedBy_id465" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id465');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id464" style="display:block">
+                           <div id="usedBy_id465" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id463" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.HWversion.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id464" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.arch.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -37249,19 +37375,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id464" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id464');"
+                           <div class="floatRight"><input id="button_source_id465" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id465');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id464" style="display:block">
+                           <div id="source_id465" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"HWversion"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"arch"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The virtual HW version number for the VMware configuration</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the VM architecture type</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ix86"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"x86_64"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"%arch"</span><span class="tokenElement">/></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
                               </table>
@@ -37278,8 +37411,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id466"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id465" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.guestOS.attribute</a></b> / @guestOS</span></div>
+      </table><a id="id467"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id466" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.HWversion.attribute</a></b> / @HWversion</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -37298,18 +37431,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id466" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id467" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id466');"
+                                     onclick="switchState('annotations_id467');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id466" style="display:block">
+                           <div id="annotations_id467" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">the virtual guestOS identification string for VMware</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The virtual HW version number for the VM configuration</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -37317,15 +37450,19 @@
                         </td>
                      </tr>
                      <tr>
+                        <td class="firstColumn"><b>Type</b></td>
+                        <td><b>xs:integer</b></td>
+                     </tr>
+                     <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id466" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id467" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id466');"
+                                     onclick="switchState('properties_id467');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id466" style="display:block">
+                           <div id="properties_id467" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -37340,17 +37477,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id466" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id466');"
+                           <div class="floatRight"><input id="button_usedBy_id467" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id467');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id466" style="display:block">
+                           <div id="usedBy_id467" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id465" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.guestOS.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id466" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.HWversion.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -37359,18 +37496,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id466" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id466');"
+                           <div class="floatRight"><input id="button_source_id467" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id467');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id466" style="display:block">
+                           <div id="source_id467" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"guestOS"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"HWversion"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the virtual guestOS identification string for VMware</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The virtual HW version number for the VM configuration</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -37388,8 +37525,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id468"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id467" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.usb.attribute</a></b> / @usb</span></div>
+      </table><a id="id469"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id468" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.guestOS.attribute</a></b> / @guestOS</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -37408,18 +37545,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id468" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id469" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id468');"
+                                     onclick="switchState('annotations_id469');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id468" style="display:block">
+                           <div id="annotations_id469" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">Activate/Deactivate usb controller for VMware</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">the virtual guestOS identification string for the VM</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -37427,19 +37564,15 @@
                         </td>
                      </tr>
                      <tr>
-                        <td class="firstColumn"><b>Type</b></td>
-                        <td><b>xs:boolean</b></td>
-                     </tr>
-                     <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id468" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id469" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id468');"
+                                     onclick="switchState('properties_id469');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id468" style="display:block">
+                           <div id="properties_id469" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -37454,17 +37587,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id468" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id468');"
+                           <div class="floatRight"><input id="button_usedBy_id469" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id469');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id468" style="display:block">
+                           <div id="usedBy_id469" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id467" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.usb.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id468" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.guestOS.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -37473,18 +37606,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id468" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id468');"
+                           <div class="floatRight"><input id="button_source_id469" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id469');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id468" style="display:block">
+                           <div id="source_id469" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"usb"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"guestOS"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Activate/Deactivate usb controller for VMware</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the virtual guestOS identification string for the VM</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -37502,8 +37635,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id470"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id469" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.memory.attribute</a></b> / @memory</span></div>
+      </table><a id="id471"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id470" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.memory.attribute</a></b> / @memory</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -37522,18 +37655,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id470" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id471" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id470');"
+                                     onclick="switchState('annotations_id471');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id470" style="display:block">
+                           <div id="annotations_id471" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The memory setup for the Xen guest.</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The memory setup for the guest VM.</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -37543,13 +37676,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id470" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id471" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id470');"
+                                     onclick="switchState('properties_id471');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id470" style="display:block">
+                           <div id="properties_id471" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -37564,17 +37697,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id470" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id470');"
+                           <div class="floatRight"><input id="button_usedBy_id471" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id471');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id470" style="display:block">
+                           <div id="usedBy_id471" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id469" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.memory.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id470" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.memory.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -37583,18 +37716,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id470" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id470');"
+                           <div class="floatRight"><input id="button_source_id471" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id471');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id470" style="display:block">
+                           <div id="source_id471" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
                                     <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"memory"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The memory setup for the Xen guest.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The memory setup for the guest VM.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attribute></span></pre></td>
                                  </tr>
@@ -37612,8 +37745,8 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id472"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id471" target="mainFrame" title="No namespace"
-                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.domain.attribute</a></b> / @domain</span></div>
+      </table><a id="id473"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id472" target="mainFrame" title="No namespace"
+                  onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.domain.attribute</a></b> / @domain</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -37632,18 +37765,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id472" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id473" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id472');"
+                                     onclick="switchState('annotations_id473');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id472" style="display:block">
+                           <div id="annotations_id473" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
                                     <tr>
-                                       <td width="100%"><pre><span class="tokenText">The type of Xen domain to create (dom0 or domU)</span></pre></td>
+                                       <td width="100%"><pre><span class="tokenText">The domain setup for the VM (xen only)</span></pre></td>
                                     </tr>
                                  </table>
                               </div>
@@ -37657,13 +37790,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id472" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id473" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id472');"
+                                     onclick="switchState('properties_id473');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id472" style="display:block">
+                           <div id="properties_id473" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -37678,12 +37811,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id472" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id472');"
+                           <div class="floatRight"><input id="button_facets_id473" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id473');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id472" style="display:block">
+                           <div id="facets_id473" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -37706,17 +37839,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id472" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id472');"
+                           <div class="floatRight"><input id="button_usedBy_id473" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id473');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id472" style="display:block">
+                           <div id="usedBy_id473" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id471" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.domain.attribute</a></b></td>
+                                    <td><b><a href="kiwi0.html#id472" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.domain.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -37725,18 +37858,18 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id472" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id472');"
+                           <div class="floatRight"><input id="button_source_id473" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id473');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id472" style="display:block">
+                           <div id="source_id473" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
                                     <td width="100%"><pre><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"domain"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The type of Xen domain to create (dom0 or domU)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The domain setup for the VM (xen only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
@@ -37760,7 +37893,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id474"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id473" target="mainFrame" title="No namespace"
+      </table><a id="id475"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id474" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.profiles.attribute</a></b> / @profiles</span></div>
       <table class="rt">
          <tr>
@@ -37780,13 +37913,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id474" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id475" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id474');"
+                                     onclick="switchState('properties_id475');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id474" style="display:block">
+                           <div id="properties_id475" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -37801,16 +37934,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id474" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id474');"
+                           <div class="floatRight"><input id="button_usedBy_id475" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id475');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id474" style="display:block">
+                           <div id="usedBy_id475" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id473" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id474" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.profiles.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -37820,12 +37953,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id474" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id474');"
+                           <div class="floatRight"><input id="button_source_id475" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id475');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id474" style="display:block">
+                           <div id="source_id475" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -37845,7 +37978,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id476"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id475" target="mainFrame" title="No namespace"
+      </table><a id="id477"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id476" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.patternType.attribute</a></b> / @patternType</span></div>
       <table class="rt">
          <tr>
@@ -37869,13 +38002,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id476" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id477" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id476');"
+                                     onclick="switchState('properties_id477');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id476" style="display:block">
+                           <div id="properties_id477" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -37890,12 +38023,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Facets</b></div>
-                           <div class="floatRight"><input id="button_facets_id476" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('facets_id476');"
+                           <div class="floatRight"><input id="button_facets_id477" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('facets_id477');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="facets_id476" style="display:block">
+                           <div id="facets_id477" style="display:block">
                               <table class="facetsTable">
                                  <tr>
                                     <td class="firstColumn">enumeration</td>
@@ -37918,16 +38051,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id476" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id476');"
+                           <div class="floatRight"><input id="button_usedBy_id477" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id477');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id476" style="display:block">
+                           <div id="usedBy_id477" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id475" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id476" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.patternType.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -37937,12 +38070,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id476" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id476');"
+                           <div class="floatRight"><input id="button_source_id477" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id477');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id476" style="display:block">
+                           <div id="source_id477" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -37969,7 +38102,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id479"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id478" target="mainFrame" title="No namespace"
+      </table><a id="id480"></a><div class="componentTitle">Attribute <span class="qname"><b><a href="kiwi0.html#id479" target="mainFrame" title="No namespace"
                   onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.id.attribute</a></b> / @id</span></div>
       <table class="rt">
          <tr>
@@ -37989,13 +38122,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id479" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id480" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id479');"
+                                     onclick="switchState('annotations_id480');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id479" style="display:block">
+                           <div id="annotations_id480" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -38014,13 +38147,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id479" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id480" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id479');"
+                                     onclick="switchState('properties_id480');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id479" style="display:block">
+                           <div id="properties_id480" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">use:
@@ -38035,16 +38168,16 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id479" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id479');"
+                           <div class="floatRight"><input id="button_usedBy_id480" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id480');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id479" style="display:block">
+                           <div id="usedBy_id480" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id478" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id479" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.id.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -38054,12 +38187,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id479" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id479');"
+                           <div class="floatRight"><input id="button_source_id480" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id480');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id479" style="display:block">
+                           <div id="source_id480" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -38083,7 +38216,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id4"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.name.attribute</span></div>
+      </table><a id="id5"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -38102,30 +38235,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id4" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id4');"
+                           <div class="floatRight"><input id="button_diagram_id5" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id5');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id4" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html148.jpeg"
-                                   usemap="#kiwi_46_html148" /><map name="kiwi_46_html148" id="kiwi_46_html148">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="219,44,285,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="208,3,350,29" /></map></div>
+                           <div id="diagram_id5" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html101.jpeg"
+                                   usemap="#kiwi_46_html101" /><map name="kiwi_46_html101" id="kiwi_46_html101">
+                                 <area alt="kiwi0.tmp#id7" href="kiwi0.html#id7" coords="219,44,351,86" />
+                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="208,3,382,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id4" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id4');"
+                           <div class="floatRight"><input id="button_usedBy_id5" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id5');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id4" style="display:block">
+                           <div id="usedBy_id5" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -38135,12 +38268,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id4" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('attributes_id4');"
+                           <div class="floatRight"><input id="button_attributes_id5" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('attributes_id5');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id4" style="display:block">
+                           <div id="attributes_id5" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -38153,9 +38286,10 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id7" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
-                                    <td></td>
+                                    <td><b><a href="kiwi0.html#id4" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image-name</a></b></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -38164,7 +38298,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">A name</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">An image name without / and spaces</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -38177,17 +38311,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id4" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id4');"
+                           <div class="floatRight"><input id="button_source_id5" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id5');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id4" style="display:block">
+                           <div id="source_id5" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
                                     <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.image.name.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.name.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.imagename.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
                                  </tr>
                               </table>
@@ -38204,7 +38338,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id5"></a><div class="componentTitle">Attribute Group <span class="qname">k.name.attribute</span></div>
+      </table><a id="id6"></a><div class="componentTitle">Attribute Group <span class="qname">k.imagename.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -38223,44 +38357,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id5" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id5');"
+                           <div class="floatRight"><input id="button_diagram_id6" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id6');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id5" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html83.jpeg" usemap="#kiwi_46_html83" /><map name="kiwi_46_html83" id="kiwi_46_html83">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="170,1,236,25" /></map></div>
+                           <div id="diagram_id6" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html146.jpeg"
+                                   usemap="#kiwi_46_html146" /><map name="kiwi_46_html146" id="kiwi_46_html146">
+                                 <area alt="kiwi0.tmp#id7" href="kiwi0.html#id7" coords="202,0,334,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id5" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id5');"
+                           <div class="floatRight"><input id="button_usedBy_id6" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id6');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id5" style="display:block">
+                           <div id="usedBy_id6" style="display:block">
                               <table class="usedByTable">
                                  <tr>
-                                    <td class="firstColumn">Attribute Groups </td>
-                                    <td><b><a href="kiwi0.html#id218" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.name.attribute</a></b>, <b><a href="kiwi0.html#id326" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.name.attribute</a></b>, <b><a href="kiwi0.html#id115" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.except.name.attribute</a></b>, <b><a href="kiwi0.html#id118" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.name.attribute</a></b>, <b><a href="kiwi0.html#id323" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.ignore.name.attribute</a></b>, <b><a href="kiwi0.html#id4" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.name.attribute</a></b>, <b><a href="kiwi0.html#id311" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.name.attribute</a></b>, <b><a href="kiwi0.html#id319" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.name.attribute</a></b>, <b><a href="kiwi0.html#id304" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.name.attribute</a></b>, <b><a href="kiwi0.html#id228" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productinfo.attlist</a></b>, <b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productoption.attlist</a></b>, <b><a href="kiwi0.html#id230" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productvar.attlist</a></b>, <b><a href="kiwi0.html#id207" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.name.attribute</a></b>, <b><a href="kiwi0.html#id249" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.name.attribute</a></b>, <b><a href="kiwi0.html#id315" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.name.attribute</a></b>, <b><a href="kiwi0.html#id274" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.name.attribute</a></b></td>
+                                    <td class="firstColumn">Attribute Group </td>
+                                    <td><b><a href="kiwi0.html#id5" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.name.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -38269,12 +38389,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id5" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('attributes_id5');"
+                           <div class="floatRight"><input id="button_attributes_id6" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('attributes_id6');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id5" style="display:block">
+                           <div id="attributes_id6" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -38287,9 +38407,10 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id7" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
-                                    <td></td>
+                                    <td><b><a href="kiwi0.html#id4" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image-name</a></b></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -38298,7 +38419,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">A name</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">An image name without / and spaces</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -38311,19 +38432,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id5" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id5');"
+                           <div class="floatRight"><input id="button_source_id6" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id6');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id5" style="display:block">
+                           <div id="source_id6" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.name.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.imagename.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"image-name"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">A name</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">An image name without / and spaces</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
@@ -38342,7 +38463,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id7"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.displayname.attribute</span></div>
+      </table><a id="id8"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.displayname.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -38361,26 +38482,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id7" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id7');"
+                           <div class="floatRight"><input id="button_diagram_id8" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id8');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id7" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html245.jpeg"
-                                   usemap="#kiwi_46_html245" /><map name="kiwi_46_html245" id="kiwi_46_html245">
-                                 <area alt="kiwi0.tmp#id9" href="kiwi0.html#id9" coords="257,44,361,68" />
-                                 <area alt="kiwi0.tmp#id8" href="kiwi0.html#id8" coords="246,3,426,29" /></map></div>
+                           <div id="diagram_id8" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html150.jpeg"
+                                   usemap="#kiwi_46_html150" /><map name="kiwi_46_html150" id="kiwi_46_html150">
+                                 <area alt="kiwi0.tmp#id10" href="kiwi0.html#id10" coords="257,44,361,68" />
+                                 <area alt="kiwi0.tmp#id9" href="kiwi0.html#id9" coords="246,3,426,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id7" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('attributes_id7');"
+                           <div class="floatRight"><input id="button_attributes_id8" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('attributes_id8');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id7" style="display:block">
+                           <div id="attributes_id8" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -38393,7 +38514,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id9" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id10" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">displayname</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -38410,12 +38531,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id7" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id7');"
+                           <div class="floatRight"><input id="button_source_id8" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id8');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id7" style="display:block">
+                           <div id="source_id8" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -38437,7 +38558,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id8"></a><div class="componentTitle">Attribute Group <span class="qname">k.displayname.attribute</span></div>
+      </table><a id="id9"></a><div class="componentTitle">Attribute Group <span class="qname">k.displayname.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -38456,29 +38577,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id8" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id8');"
+                           <div class="floatRight"><input id="button_diagram_id9" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id9');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id8" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html214.jpeg"
-                                   usemap="#kiwi_46_html214" /><map name="kiwi_46_html214" id="kiwi_46_html214">
-                                 <area alt="kiwi0.tmp#id9" href="kiwi0.html#id9" coords="208,1,312,25" /></map></div>
+                           <div id="diagram_id9" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html177.jpeg"
+                                   usemap="#kiwi_46_html177" /><map name="kiwi_46_html177" id="kiwi_46_html177">
+                                 <area alt="kiwi0.tmp#id10" href="kiwi0.html#id10" coords="208,1,312,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id8" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id8');"
+                           <div class="floatRight"><input id="button_usedBy_id9" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id9');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id8" style="display:block">
+                           <div id="usedBy_id9" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id7" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id8" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.displayname.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -38488,12 +38609,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id8" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('attributes_id8');"
+                           <div class="floatRight"><input id="button_attributes_id9" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('attributes_id9');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id8" style="display:block">
+                           <div id="attributes_id9" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -38506,7 +38627,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id9" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id10" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">displayname</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -38523,12 +38644,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id8" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id8');"
+                           <div class="floatRight"><input id="button_source_id9" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id9');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id8" style="display:block">
+                           <div id="source_id9" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -38550,7 +38671,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id10"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.noNamespaceSchemaLocation.attribute</span></div>
+      </table><a id="id11"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.noNamespaceSchemaLocation.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -38569,26 +38690,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id10" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id10');"
+                           <div class="floatRight"><input id="button_diagram_id11" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id11');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id10" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html231.jpeg"
-                                   usemap="#kiwi_46_html231" /><map name="kiwi_46_html231" id="kiwi_46_html231">
-                                 <area alt="kiwi1.tmp#id11" href="kiwi1.html#id11" coords="338,1,567,25" /></map></div>
+                           <div id="diagram_id11" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html188.jpeg"
+                                   usemap="#kiwi_46_html188" /><map name="kiwi_46_html188" id="kiwi_46_html188">
+                                 <area alt="kiwi1.tmp#id12" href="kiwi1.html#id12" coords="338,1,567,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id10" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id11" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id10');"
+                                     onclick="switchState('attributes_id11');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id10" style="display:block">
+                           <div id="attributes_id11" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -38601,7 +38722,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi1.html#id11" target="mainFrame"
+                                    <td class="firstColumn"><b><a href="kiwi1.html#id12" target="mainFrame"
                                              title="http://www.w3.org/2001/XMLSchema-instance"
                                              onclick="updatePageTitle('Schema documentation for xsi.xsd')">xsi:noNamespaceSchemaLocation</a></b></td>
                                     <td><b>xs:anyURI</b></td>
@@ -38626,12 +38747,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id10" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id10');"
+                           <div class="floatRight"><input id="button_source_id11" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id11');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id10" style="display:block">
+                           <div id="source_id11" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -38653,7 +38774,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id12"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.schemaLocation.attribute</span></div>
+      </table><a id="id13"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.schemaLocation.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -38672,25 +38793,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id12" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id12');"
+                           <div class="floatRight"><input id="button_diagram_id13" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id13');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id12" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html30.jpeg" usemap="#kiwi_46_html30" /><map name="kiwi_46_html30" id="kiwi_46_html30">
-                                 <area alt="kiwi1.tmp#id13" href="kiwi1.html#id13" coords="263,1,417,25" /></map></div>
+                           <div id="diagram_id13" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html115.jpeg"
+                                   usemap="#kiwi_46_html115" /><map name="kiwi_46_html115" id="kiwi_46_html115">
+                                 <area alt="kiwi1.tmp#id14" href="kiwi1.html#id14" coords="263,1,417,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id12" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id13" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id12');"
+                                     onclick="switchState('attributes_id13');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id12" style="display:block">
+                           <div id="attributes_id13" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -38703,7 +38825,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi1.html#id13" target="mainFrame"
+                                    <td class="firstColumn"><b><a href="kiwi1.html#id14" target="mainFrame"
                                              title="http://www.w3.org/2001/XMLSchema-instance"
                                              onclick="updatePageTitle('Schema documentation for xsi.xsd')">xsi:schemaLocation</a></b></td>
                                     <td><b>xs:anyURI</b></td>
@@ -38721,12 +38843,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id12" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id12');"
+                           <div class="floatRight"><input id="button_source_id13" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id13');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id12" style="display:block">
+                           <div id="source_id13" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -38748,7 +38870,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id14"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.inherit.attribute</span></div>
+      </table><a id="id15"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.inherit.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -38767,26 +38889,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id14" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id14');"
+                           <div class="floatRight"><input id="button_diagram_id15" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id15');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id14" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html213.jpeg"
-                                   usemap="#kiwi_46_html213" /><map name="kiwi_46_html213" id="kiwi_46_html213">
-                                 <area alt="kiwi0.tmp#id15" href="kiwi0.html#id15" coords="211,1,283,25" /></map></div>
+                           <div id="diagram_id15" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html105.jpeg"
+                                   usemap="#kiwi_46_html105" /><map name="kiwi_46_html105" id="kiwi_46_html105">
+                                 <area alt="kiwi0.tmp#id16" href="kiwi0.html#id16" coords="211,1,283,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id14" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id15" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id14');"
+                                     onclick="switchState('attributes_id15');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id14" style="display:block">
+                           <div id="attributes_id15" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -38799,7 +38921,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id15" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id16" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">inherit</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -38816,12 +38938,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id14" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id14');"
+                           <div class="floatRight"><input id="button_source_id15" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id15');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id14" style="display:block">
+                           <div id="source_id15" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -38843,7 +38965,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id16"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.schemaversion.attribute</span></div>
+      </table><a id="id17"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.schemaversion.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -38862,29 +38984,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id16" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id16');"
+                           <div class="floatRight"><input id="button_diagram_id17" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id17');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id16" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html153.jpeg"
-                                   usemap="#kiwi_46_html153" /><map name="kiwi_46_html153" id="kiwi_46_html153">
-                                 <area alt="kiwi0.tmp#id17" href="kiwi0.html#id17" coords="257,0,447,42" /></map></div>
+                           <div id="diagram_id17" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html240.jpeg"
+                                   usemap="#kiwi_46_html240" /><map name="kiwi_46_html240" id="kiwi_46_html240">
+                                 <area alt="kiwi0.tmp#id18" href="kiwi0.html#id18" coords="257,0,447,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id16" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id16');"
+                           <div class="floatRight"><input id="button_usedBy_id17" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id17');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id16" style="display:block">
+                           <div id="usedBy_id17" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -38894,13 +39016,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id16" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id17" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id16');"
+                                     onclick="switchState('attributes_id17');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id16" style="display:block">
+                           <div id="attributes_id17" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -38913,7 +39035,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id17" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id18" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">schemaversion</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -38937,12 +39059,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id16" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id16');"
+                           <div class="floatRight"><input id="button_source_id17" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id17');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id16" style="display:block">
+                           <div id="source_id17" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -38973,7 +39095,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id18"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.kiwirevision.attribute</span></div>
+      </table><a id="id19"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.kiwirevision.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -38992,26 +39114,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id18" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id18');"
+                           <div class="floatRight"><input id="button_diagram_id19" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id19');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id18" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html121.jpeg"
-                                   usemap="#kiwi_46_html121" /><map name="kiwi_46_html121" id="kiwi_46_html121">
-                                 <area alt="kiwi0.tmp#id19" href="kiwi0.html#id19" coords="239,0,425,42" /></map></div>
+                           <div id="diagram_id19" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html154.jpeg"
+                                   usemap="#kiwi_46_html154" /><map name="kiwi_46_html154" id="kiwi_46_html154">
+                                 <area alt="kiwi0.tmp#id20" href="kiwi0.html#id20" coords="239,0,425,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id18" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id19" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id18');"
+                                     onclick="switchState('attributes_id19');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id18" style="display:block">
+                           <div id="attributes_id19" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -39024,7 +39146,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id19" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id20" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">kiwirevision</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -39041,12 +39163,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id18" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id18');"
+                           <div class="floatRight"><input id="button_source_id19" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id19');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id18" style="display:block">
+                           <div id="source_id19" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -39068,7 +39190,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id20"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.id</span></div>
+      </table><a id="id21"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.id</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -39087,26 +39209,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id20" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id20');"
+                           <div class="floatRight"><input id="button_diagram_id21" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id21');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id20" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html259.jpeg"
-                                   usemap="#kiwi_46_html259" /><map name="kiwi_46_html259" id="kiwi_46_html259">
-                                 <area alt="kiwi0.tmp#id21" href="kiwi0.html#id21" coords="137,0,329,42" /></map></div>
+                           <div id="diagram_id21" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html136.jpeg"
+                                   usemap="#kiwi_46_html136" /><map name="kiwi_46_html136" id="kiwi_46_html136">
+                                 <area alt="kiwi0.tmp#id22" href="kiwi0.html#id22" coords="137,0,329,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id20" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id21" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id20');"
+                                     onclick="switchState('attributes_id21');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id20" style="display:block">
+                           <div id="attributes_id21" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -39119,7 +39241,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id21" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td>restriction of <b>xs:string</b></td>
                                     <td></td>
@@ -39136,12 +39258,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id20" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id20');"
+                           <div class="floatRight"><input id="button_source_id21" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id21');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id20" style="display:block">
+                           <div id="source_id21" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -39169,7 +39291,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id22"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.attlist</span></div>
+      </table><a id="id23"></a><div class="componentTitle">Attribute Group <span class="qname">k.image.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -39188,38 +39310,38 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id22" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id22');"
+                           <div class="floatRight"><input id="button_diagram_id23" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id23');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id22" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html210.jpeg"
-                                   usemap="#kiwi_46_html210" /><map name="kiwi_46_html210" id="kiwi_46_html210">
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="174,47,316,73" />
-                                 <area alt="kiwi0.tmp#id4" href="kiwi0.html#id4" coords="160,3,337,29" />
-                                 <area alt="kiwi0.tmp#id23" href="kiwi0.html#id23" coords="157,95,261,119" />
-                                 <area alt="kiwi0.tmp#id24" href="kiwi0.html#id24" coords="157,129,229,153" />
-                                 <area alt="kiwi0.tmp#id25" href="kiwi0.html#id25" coords="157,163,343,205" />
-                                 <area alt="kiwi0.tmp#id26" href="kiwi0.html#id26" coords="157,215,349,257" />
-                                 <area alt="kiwi0.tmp#id17" href="kiwi0.html#id17" coords="171,311,361,353" />
-                                 <area alt="kiwi0.tmp#id16" href="kiwi0.html#id16" coords="160,270,389,296" />
-                                 <area alt="kiwi1.tmp#id11" href="kiwi1.html#id11" coords="157,370,386,394" />
-                                 <area alt="kiwi1.tmp#id13" href="kiwi1.html#id13" coords="157,404,311,428" /></map></div>
+                           <div id="diagram_id23" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html236.jpeg"
+                                   usemap="#kiwi_46_html236" /><map name="kiwi_46_html236" id="kiwi_46_html236">
+                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="174,47,348,73" />
+                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="160,3,337,29" />
+                                 <area alt="kiwi0.tmp#id24" href="kiwi0.html#id24" coords="157,95,261,119" />
+                                 <area alt="kiwi0.tmp#id25" href="kiwi0.html#id25" coords="157,129,229,153" />
+                                 <area alt="kiwi0.tmp#id26" href="kiwi0.html#id26" coords="157,163,343,205" />
+                                 <area alt="kiwi0.tmp#id27" href="kiwi0.html#id27" coords="157,215,349,257" />
+                                 <area alt="kiwi0.tmp#id18" href="kiwi0.html#id18" coords="171,311,361,353" />
+                                 <area alt="kiwi0.tmp#id17" href="kiwi0.html#id17" coords="160,270,389,296" />
+                                 <area alt="kiwi1.tmp#id12" href="kiwi1.html#id12" coords="157,370,386,394" />
+                                 <area alt="kiwi1.tmp#id14" href="kiwi1.html#id14" coords="157,404,311,428" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id22" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id22');"
+                           <div class="floatRight"><input id="button_usedBy_id23" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id23');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id22" style="display:block">
+                           <div id="usedBy_id23" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></td>
                                  </tr>
                               </table>
@@ -39229,13 +39351,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id22" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id23" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id22');"
+                                     onclick="switchState('attributes_id23');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id22" style="display:block">
+                           <div id="attributes_id23" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -39248,7 +39370,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id24" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">displayname</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -39259,7 +39381,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id26" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td>restriction of <b>xs:string</b></td>
                                     <td></td>
@@ -39270,7 +39392,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id24" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id25" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">inherit</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -39281,7 +39403,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id25" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id26" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">kiwirevision</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -39292,9 +39414,10 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id7" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
-                                    <td></td>
+                                    <td><b><a href="kiwi0.html#id4" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image-name</a></b></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -39303,14 +39426,14 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">A name</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">An image name without / and spaces</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id17" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id18" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">schemaversion</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -39328,7 +39451,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi1.html#id11" target="mainFrame"
+                                    <td class="firstColumn"><b><a href="kiwi1.html#id12" target="mainFrame"
                                              title="http://www.w3.org/2001/XMLSchema-instance"
                                              onclick="updatePageTitle('Schema documentation for xsi.xsd')">xsi:noNamespaceSchemaLocation</a></b></td>
                                     <td><b>xs:anyURI</b></td>
@@ -39347,7 +39470,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi1.html#id13" target="mainFrame"
+                                    <td class="firstColumn"><b><a href="kiwi1.html#id14" target="mainFrame"
                                              title="http://www.w3.org/2001/XMLSchema-instance"
                                              onclick="updatePageTitle('Schema documentation for xsi.xsd')">xsi:schemaLocation</a></b></td>
                                     <td><b>xs:anyURI</b></td>
@@ -39365,12 +39488,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id22" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id22');"
+                           <div class="floatRight"><input id="button_source_id23" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id23');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id22" style="display:block">
+                           <div id="source_id23" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -39405,7 +39528,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id32"></a><div class="componentTitle">Attribute Group <span class="qname">k.description.attlist</span></div>
+      </table><a id="id33"></a><div class="componentTitle">Attribute Group <span class="qname">k.description.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -39424,29 +39547,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id32" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id32');"
+                           <div class="floatRight"><input id="button_diagram_id33" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id33');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id32" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html41.jpeg" usemap="#kiwi_46_html41" /><map name="kiwi_46_html41" id="kiwi_46_html41">
-                                 <area alt="kiwi0.tmp#id34" href="kiwi0.html#id34" coords="200,44,390,86" />
-                                 <area alt="kiwi0.tmp#id33" href="kiwi0.html#id33" coords="189,3,389,29" /></map></div>
+                           <div id="diagram_id33" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html247.jpeg"
+                                   usemap="#kiwi_46_html247" /><map name="kiwi_46_html247" id="kiwi_46_html247">
+                                 <area alt="kiwi0.tmp#id35" href="kiwi0.html#id35" coords="200,44,390,86" />
+                                 <area alt="kiwi0.tmp#id34" href="kiwi0.html#id34" coords="189,3,389,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id32" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id32');"
+                           <div class="floatRight"><input id="button_usedBy_id33" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id33');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id32" style="display:block">
+                           <div id="usedBy_id33" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b></td>
                                  </tr>
                               </table>
@@ -39456,13 +39580,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id32" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id33" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id32');"
+                                     onclick="switchState('attributes_id33');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id32" style="display:block">
+                           <div id="attributes_id33" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -39475,7 +39599,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id34" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -39492,12 +39616,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id32" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id32');"
+                           <div class="floatRight"><input id="button_source_id33" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id33');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id32" style="display:block">
+                           <div id="source_id33" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -39519,7 +39643,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id33"></a><div class="componentTitle">Attribute Group <span class="qname">k.description.type.attribute</span></div>
+      </table><a id="id34"></a><div class="componentTitle">Attribute Group <span class="qname">k.description.type.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -39538,29 +39662,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id33" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id33');"
+                           <div class="floatRight"><input id="button_diagram_id34" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id34');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id33" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html144.jpeg"
-                                   usemap="#kiwi_46_html144" /><map name="kiwi_46_html144" id="kiwi_46_html144">
-                                 <area alt="kiwi0.tmp#id34" href="kiwi0.html#id34" coords="228,0,418,42" /></map></div>
+                           <div id="diagram_id34" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html284.jpeg"
+                                   usemap="#kiwi_46_html284" /><map name="kiwi_46_html284" id="kiwi_46_html284">
+                                 <area alt="kiwi0.tmp#id35" href="kiwi0.html#id35" coords="228,0,418,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id33" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id33');"
+                           <div class="floatRight"><input id="button_usedBy_id34" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id34');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id33" style="display:block">
+                           <div id="usedBy_id34" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id32" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id33" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -39570,13 +39694,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id33" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id34" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id33');"
+                                     onclick="switchState('attributes_id34');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id33" style="display:block">
+                           <div id="attributes_id34" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -39589,7 +39713,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id34" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -39606,12 +39730,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id33" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id33');"
+                           <div class="floatRight"><input id="button_source_id34" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id34');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id33" style="display:block">
+                           <div id="source_id34" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -39640,7 +39764,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id43"></a><div class="componentTitle">Attribute Group <span class="qname">k.volume.attlist</span></div>
+      </table><a id="id44"></a><div class="componentTitle">Attribute Group <span class="qname">k.volume.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -39659,32 +39783,32 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id43" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id43');"
+                           <div class="floatRight"><input id="button_diagram_id44" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id44');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id43" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html101.jpeg"
-                                   usemap="#kiwi_46_html101" /><map name="kiwi_46_html101" id="kiwi_46_html101">
-                                 <area alt="kiwi0.tmp#id44" href="kiwi0.html#id44" coords="164,0,324,42" />
-                                 <area alt="kiwi0.tmp#id45" href="kiwi0.html#id45" coords="164,52,324,94" />
-                                 <area alt="kiwi0.tmp#id47" href="kiwi0.html#id47" coords="178,148,244,172" />
-                                 <area alt="kiwi0.tmp#id46" href="kiwi0.html#id46" coords="167,107,351,133" /></map></div>
+                           <div id="diagram_id44" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html241.jpeg"
+                                   usemap="#kiwi_46_html241" /><map name="kiwi_46_html241" id="kiwi_46_html241">
+                                 <area alt="kiwi0.tmp#id45" href="kiwi0.html#id45" coords="164,0,324,42" />
+                                 <area alt="kiwi0.tmp#id46" href="kiwi0.html#id46" coords="164,52,324,94" />
+                                 <area alt="kiwi0.tmp#id48" href="kiwi0.html#id48" coords="178,148,244,172" />
+                                 <area alt="kiwi0.tmp#id47" href="kiwi0.html#id47" coords="167,107,351,133" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id43" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id43');"
+                           <div class="floatRight"><input id="button_usedBy_id44" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id44');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id43" style="display:block">
+                           <div id="usedBy_id44" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id42" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volume</a></b></td>
                                  </tr>
                               </table>
@@ -39694,13 +39818,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id43" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id44" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id43');"
+                                     onclick="switchState('attributes_id44');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id43" style="display:block">
+                           <div id="attributes_id44" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -39713,7 +39837,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id44" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id45" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">freespace</a></b></td>
                                     <td><b><a href="kiwi0.html#id3" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volume-size-type</a></b></td>
@@ -39725,7 +39849,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id47" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id48" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -39736,7 +39860,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id45" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id46" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b></td>
                                     <td><b><a href="kiwi0.html#id3" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volume-size-type</a></b></td>
@@ -39754,12 +39878,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id43" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id43');"
+                           <div class="floatRight"><input id="button_source_id44" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id44');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id43" style="display:block">
+                           <div id="source_id44" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -39783,7 +39907,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id46"></a><div class="componentTitle">Attribute Group <span class="qname">k.volume.name.attribute</span></div>
+      </table><a id="id47"></a><div class="componentTitle">Attribute Group <span class="qname">k.volume.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -39802,28 +39926,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id46" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id46');"
+                           <div class="floatRight"><input id="button_diagram_id47" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id47');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id46" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html73.jpeg" usemap="#kiwi_46_html73" /><map name="kiwi_46_html73" id="kiwi_46_html73">
-                                 <area alt="kiwi0.tmp#id47" href="kiwi0.html#id47" coords="212,1,278,25" /></map></div>
+                           <div id="diagram_id47" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html182.jpeg"
+                                   usemap="#kiwi_46_html182" /><map name="kiwi_46_html182" id="kiwi_46_html182">
+                                 <area alt="kiwi0.tmp#id48" href="kiwi0.html#id48" coords="212,1,278,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id46" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id46');"
+                           <div class="floatRight"><input id="button_usedBy_id47" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id47');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id46" style="display:block">
+                           <div id="usedBy_id47" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id44" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -39833,13 +39958,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id46" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id47" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id46');"
+                                     onclick="switchState('attributes_id47');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id46" style="display:block">
+                           <div id="attributes_id47" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -39852,7 +39977,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id47" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id48" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -39869,12 +39994,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id46" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id46');"
+                           <div class="floatRight"><input id="button_source_id47" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id47');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id46" style="display:block">
+                           <div id="source_id47" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -39896,7 +40021,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id48"></a><div class="componentTitle">Attribute Group <span class="qname">k.lvmvolumes.attlist</span></div>
+      </table><a id="id49"></a><div class="componentTitle">Attribute Group <span class="qname">k.lvmvolumes.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -39915,29 +40040,28 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id48" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id48');"
+                           <div class="floatRight"><input id="button_diagram_id49" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id49');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id48" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html282.jpeg"
-                                   usemap="#kiwi_46_html282" /><map name="kiwi_46_html282" id="kiwi_46_html282">
-                                 <area alt="kiwi0.tmp#id49" href="kiwi0.html#id49" coords="189,1,278,25" /></map></div>
+                           <div id="diagram_id49" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html16.jpeg" usemap="#kiwi_46_html16" /><map name="kiwi_46_html16" id="kiwi_46_html16">
+                                 <area alt="kiwi0.tmp#id50" href="kiwi0.html#id50" coords="189,1,278,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id48" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id48');"
+                           <div class="floatRight"><input id="button_usedBy_id49" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id49');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id48" style="display:block">
+                           <div id="usedBy_id49" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id41" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id42" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvmvolumes</a></b></td>
                                  </tr>
                               </table>
@@ -39947,13 +40071,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id48" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id49" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id48');"
+                                     onclick="switchState('attributes_id49');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id48" style="display:block">
+                           <div id="attributes_id49" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -39966,7 +40090,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id49" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvmgroup</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -39990,12 +40114,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id48" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id48');"
+                           <div class="floatRight"><input id="button_source_id49" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id49');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id48" style="display:block">
+                           <div id="source_id49" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -40021,7 +40145,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id77"></a><div class="componentTitle">Attribute Group <span class="qname">k.partition.attlist</span></div>
+      </table><a id="id80"></a><div class="componentTitle">Attribute Group <span class="qname">k.partition.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -40040,35 +40164,35 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id77" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id77');"
+                           <div class="floatRight"><input id="button_diagram_id80" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id80');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id77" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html263.jpeg"
-                                   usemap="#kiwi_46_html263" /><map name="kiwi_46_html263" id="kiwi_46_html263">
-                                 <area alt="kiwi0.tmp#id79" href="kiwi0.html#id79" coords="185,44,246,68" />
-                                 <area alt="kiwi0.tmp#id78" href="kiwi0.html#id78" coords="174,3,359,29" />
-                                 <area alt="kiwi0.tmp#id81" href="kiwi0.html#id81" coords="185,129,264,153" />
-                                 <area alt="kiwi0.tmp#id80" href="kiwi0.html#id80" coords="174,88,378,114" />
-                                 <area alt="kiwi0.tmp#id82" href="kiwi0.html#id82" coords="171,170,286,212" />
-                                 <area alt="kiwi0.tmp#id83" href="kiwi0.html#id83" coords="171,222,271,246" />
-                                 <area alt="kiwi0.tmp#id84" href="kiwi0.html#id84" coords="171,256,295,298" /></map></div>
+                           <div id="diagram_id80" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html183.jpeg"
+                                   usemap="#kiwi_46_html183" /><map name="kiwi_46_html183" id="kiwi_46_html183">
+                                 <area alt="kiwi0.tmp#id82" href="kiwi0.html#id82" coords="185,44,246,68" />
+                                 <area alt="kiwi0.tmp#id81" href="kiwi0.html#id81" coords="174,3,359,29" />
+                                 <area alt="kiwi0.tmp#id84" href="kiwi0.html#id84" coords="185,129,264,153" />
+                                 <area alt="kiwi0.tmp#id83" href="kiwi0.html#id83" coords="174,88,378,114" />
+                                 <area alt="kiwi0.tmp#id85" href="kiwi0.html#id85" coords="171,170,286,212" />
+                                 <area alt="kiwi0.tmp#id86" href="kiwi0.html#id86" coords="171,222,271,246" />
+                                 <area alt="kiwi0.tmp#id87" href="kiwi0.html#id87" coords="171,256,295,298" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id77" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id77');"
+                           <div class="floatRight"><input id="button_usedBy_id80" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id80');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id77" style="display:block">
+                           <div id="usedBy_id80" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id76" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id79" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partition</a></b></td>
                                  </tr>
                               </table>
@@ -40078,13 +40202,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id77" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id80" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id77');"
+                                     onclick="switchState('attributes_id80');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id77" style="display:block">
+                           <div id="attributes_id80" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -40097,7 +40221,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id83" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id86" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mountpoint</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -40115,7 +40239,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id81" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id84" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">number</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -40133,7 +40257,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id82" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id85" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b></td>
                                     <td><b><a href="kiwi0.html#id2" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size-type</a></b></td>
@@ -40152,7 +40276,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id84" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id87" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">target</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -40163,7 +40287,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id79" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id82" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -40187,12 +40311,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id77" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id77');"
+                           <div class="floatRight"><input id="button_source_id80" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id80');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id77" style="display:block">
+                           <div id="source_id80" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -40226,7 +40350,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id78"></a><div class="componentTitle">Attribute Group <span class="qname">k.partition.type.attribute</span></div>
+      </table><a id="id81"></a><div class="componentTitle">Attribute Group <span class="qname">k.partition.type.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -40245,29 +40369,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id78" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id78');"
+                           <div class="floatRight"><input id="button_diagram_id81" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id81');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id78" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html174.jpeg"
+                           <div id="diagram_id81" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html174.jpeg"
                                    usemap="#kiwi_46_html174" /><map name="kiwi_46_html174" id="kiwi_46_html174">
-                                 <area alt="kiwi0.tmp#id79" href="kiwi0.html#id79" coords="213,1,274,25" /></map></div>
+                                 <area alt="kiwi0.tmp#id82" href="kiwi0.html#id82" coords="213,1,274,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id78" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id78');"
+                           <div class="floatRight"><input id="button_usedBy_id81" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id81');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id78" style="display:block">
+                           <div id="usedBy_id81" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -40277,13 +40401,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id78" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id81" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id78');"
+                                     onclick="switchState('attributes_id81');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id78" style="display:block">
+                           <div id="attributes_id81" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -40296,7 +40420,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id79" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id82" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -40320,12 +40444,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id78" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id78');"
+                           <div class="floatRight"><input id="button_source_id81" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id81');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id78" style="display:block">
+                           <div id="source_id81" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -40351,7 +40475,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id80"></a><div class="componentTitle">Attribute Group <span class="qname">k.partition.number.attribute</span></div>
+      </table><a id="id83"></a><div class="componentTitle">Attribute Group <span class="qname">k.partition.number.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -40370,29 +40494,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id80" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id80');"
+                           <div class="floatRight"><input id="button_diagram_id83" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id83');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id80" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html216.jpeg"
-                                   usemap="#kiwi_46_html216" /><map name="kiwi_46_html216" id="kiwi_46_html216">
-                                 <area alt="kiwi0.tmp#id81" href="kiwi0.html#id81" coords="232,1,311,25" /></map></div>
+                           <div id="diagram_id83" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html274.jpeg"
+                                   usemap="#kiwi_46_html274" /><map name="kiwi_46_html274" id="kiwi_46_html274">
+                                 <area alt="kiwi0.tmp#id84" href="kiwi0.html#id84" coords="232,1,311,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id80" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id80');"
+                           <div class="floatRight"><input id="button_usedBy_id83" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id83');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id80" style="display:block">
+                           <div id="usedBy_id83" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -40402,13 +40526,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id80" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id83" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id80');"
+                                     onclick="switchState('attributes_id83');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id80" style="display:block">
+                           <div id="attributes_id83" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -40421,7 +40545,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id81" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id84" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">number</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -40445,12 +40569,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id80" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id80');"
+                           <div class="floatRight"><input id="button_source_id83" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id83');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id80" style="display:block">
+                           <div id="source_id83" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -40476,7 +40600,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id85"></a><div class="componentTitle">Attribute Group <span class="qname">k.partitions.attlist</span></div>
+      </table><a id="id88"></a><div class="componentTitle">Attribute Group <span class="qname">k.partitions.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -40495,29 +40619,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id85" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id85');"
+                           <div class="floatRight"><input id="button_diagram_id88" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id88');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id85" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html170.jpeg"
-                                   usemap="#kiwi_46_html170" /><map name="kiwi_46_html170" id="kiwi_46_html170">
-                                 <area alt="kiwi0.tmp#id86" href="kiwi0.html#id86" coords="177,1,248,25" /></map></div>
+                           <div id="diagram_id88" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html250.jpeg"
+                                   usemap="#kiwi_46_html250" /><map name="kiwi_46_html250" id="kiwi_46_html250">
+                                 <area alt="kiwi0.tmp#id89" href="kiwi0.html#id89" coords="177,1,248,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id85" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id85');"
+                           <div class="floatRight"><input id="button_usedBy_id88" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id88');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id85" style="display:block">
+                           <div id="usedBy_id88" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id75" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id78" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partitions</a></b></td>
                                  </tr>
                               </table>
@@ -40527,13 +40651,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id85" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id88" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id85');"
+                                     onclick="switchState('attributes_id88');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id85" style="display:block">
+                           <div id="attributes_id88" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -40546,7 +40670,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id86" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id89" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">device</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -40563,12 +40687,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id85" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id85');"
+                           <div class="floatRight"><input id="button_source_id88" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id88');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id85" style="display:block">
+                           <div id="source_id88" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -40590,7 +40714,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id88"></a><div class="componentTitle">Attribute Group <span class="qname">k.union.attlist</span></div>
+      </table><a id="id91"></a><div class="componentTitle">Attribute Group <span class="qname">k.union.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -40609,34 +40733,34 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id88" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id88');"
+                           <div class="floatRight"><input id="button_diagram_id91" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id91');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id88" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html217.jpeg"
-                                   usemap="#kiwi_46_html217" /><map name="kiwi_46_html217" id="kiwi_46_html217">
-                                 <area alt="kiwi0.tmp#id90" href="kiwi0.html#id90" coords="170,44,231,68" />
-                                 <area alt="kiwi0.tmp#id89" href="kiwi0.html#id89" coords="159,3,318,29" />
-                                 <area alt="kiwi0.tmp#id92" href="kiwi0.html#id92" coords="170,129,231,153" />
-                                 <area alt="kiwi0.tmp#id91" href="kiwi0.html#id91" coords="159,88,319,114" />
-                                 <area alt="kiwi0.tmp#id94" href="kiwi0.html#id94" coords="170,214,360,256" />
-                                 <area alt="kiwi0.tmp#id93" href="kiwi0.html#id93" coords="159,173,329,199" /></map></div>
+                           <div id="diagram_id91" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html285.jpeg"
+                                   usemap="#kiwi_46_html285" /><map name="kiwi_46_html285" id="kiwi_46_html285">
+                                 <area alt="kiwi0.tmp#id93" href="kiwi0.html#id93" coords="170,44,231,68" />
+                                 <area alt="kiwi0.tmp#id92" href="kiwi0.html#id92" coords="159,3,318,29" />
+                                 <area alt="kiwi0.tmp#id95" href="kiwi0.html#id95" coords="170,129,231,153" />
+                                 <area alt="kiwi0.tmp#id94" href="kiwi0.html#id94" coords="159,88,319,114" />
+                                 <area alt="kiwi0.tmp#id97" href="kiwi0.html#id97" coords="170,214,360,256" />
+                                 <area alt="kiwi0.tmp#id96" href="kiwi0.html#id96" coords="159,173,329,199" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id88" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id88');"
+                           <div class="floatRight"><input id="button_usedBy_id91" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id91');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id88" style="display:block">
+                           <div id="usedBy_id91" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id87" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id90" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">union</a></b></td>
                                  </tr>
                               </table>
@@ -40646,13 +40770,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id88" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id91" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id88');"
+                                     onclick="switchState('attributes_id91');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id88" style="display:block">
+                           <div id="attributes_id91" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -40665,7 +40789,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id90" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id93" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ro</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -40683,7 +40807,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id92" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id95" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rw</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -40701,7 +40825,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id94" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id97" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -40718,12 +40842,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id88" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id88');"
+                           <div class="floatRight"><input id="button_source_id91" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id91');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id88" style="display:block">
+                           <div id="source_id91" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -40747,7 +40871,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id89"></a><div class="componentTitle">Attribute Group <span class="qname">k.union.ro.attribute</span></div>
+      </table><a id="id92"></a><div class="componentTitle">Attribute Group <span class="qname">k.union.ro.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -40766,29 +40890,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id89" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id89');"
+                           <div class="floatRight"><input id="button_diagram_id92" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id92');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id89" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html186.jpeg"
-                                   usemap="#kiwi_46_html186" /><map name="kiwi_46_html186" id="kiwi_46_html186">
-                                 <area alt="kiwi0.tmp#id90" href="kiwi0.html#id90" coords="187,1,248,25" /></map></div>
+                           <div id="diagram_id92" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html239.jpeg"
+                                   usemap="#kiwi_46_html239" /><map name="kiwi_46_html239" id="kiwi_46_html239">
+                                 <area alt="kiwi0.tmp#id93" href="kiwi0.html#id93" coords="187,1,248,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id89" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id89');"
+                           <div class="floatRight"><input id="button_usedBy_id92" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id92');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id89" style="display:block">
+                           <div id="usedBy_id92" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id88" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id91" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -40798,13 +40922,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id89" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id92" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id89');"
+                                     onclick="switchState('attributes_id92');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id89" style="display:block">
+                           <div id="attributes_id92" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -40817,7 +40941,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id90" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id93" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ro</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -40841,12 +40965,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id89" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id89');"
+                           <div class="floatRight"><input id="button_source_id92" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id92');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id89" style="display:block">
+                           <div id="source_id92" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -40872,7 +40996,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id91"></a><div class="componentTitle">Attribute Group <span class="qname">k.union.rw.attribute</span></div>
+      </table><a id="id94"></a><div class="componentTitle">Attribute Group <span class="qname">k.union.rw.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -40891,29 +41015,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id91" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id91');"
+                           <div class="floatRight"><input id="button_diagram_id94" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id94');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id91" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html167.jpeg"
-                                   usemap="#kiwi_46_html167" /><map name="kiwi_46_html167" id="kiwi_46_html167">
-                                 <area alt="kiwi0.tmp#id92" href="kiwi0.html#id92" coords="188,1,249,25" /></map></div>
+                           <div id="diagram_id94" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html134.jpeg"
+                                   usemap="#kiwi_46_html134" /><map name="kiwi_46_html134" id="kiwi_46_html134">
+                                 <area alt="kiwi0.tmp#id95" href="kiwi0.html#id95" coords="188,1,249,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id91" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id91');"
+                           <div class="floatRight"><input id="button_usedBy_id94" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id94');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id91" style="display:block">
+                           <div id="usedBy_id94" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id88" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id91" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -40923,13 +41047,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id91" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id94" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id91');"
+                                     onclick="switchState('attributes_id94');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id91" style="display:block">
+                           <div id="attributes_id94" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -40942,7 +41066,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id92" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id95" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rw</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -40966,12 +41090,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id91" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id91');"
+                           <div class="floatRight"><input id="button_source_id94" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id94');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id91" style="display:block">
+                           <div id="source_id94" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -40997,7 +41121,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id93"></a><div class="componentTitle">Attribute Group <span class="qname">k.union.type.attribute</span></div>
+      </table><a id="id96"></a><div class="componentTitle">Attribute Group <span class="qname">k.union.type.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -41016,29 +41140,28 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id93" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id93');"
+                           <div class="floatRight"><input id="button_diagram_id96" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id96');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id93" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html158.jpeg"
-                                   usemap="#kiwi_46_html158" /><map name="kiwi_46_html158" id="kiwi_46_html158">
-                                 <area alt="kiwi0.tmp#id94" href="kiwi0.html#id94" coords="198,0,388,42" /></map></div>
+                           <div id="diagram_id96" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html4.jpeg" usemap="#kiwi_46_html4" /><map name="kiwi_46_html4" id="kiwi_46_html4">
+                                 <area alt="kiwi0.tmp#id97" href="kiwi0.html#id97" coords="198,0,388,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id93" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id93');"
+                           <div class="floatRight"><input id="button_usedBy_id96" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id96');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id93" style="display:block">
+                           <div id="usedBy_id96" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id88" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id91" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -41048,13 +41171,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id93" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id96" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id93');"
+                                     onclick="switchState('attributes_id96');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id93" style="display:block">
+                           <div id="attributes_id96" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -41067,7 +41190,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id94" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id97" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -41084,12 +41207,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id93" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id93');"
+                           <div class="floatRight"><input id="button_source_id96" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id96');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id93" style="display:block">
+                           <div id="source_id96" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -41119,7 +41242,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id96"></a><div class="componentTitle">Attribute Group <span class="qname">k.configuration.attlist</span></div>
+      </table><a id="id99"></a><div class="componentTitle">Attribute Group <span class="qname">k.configuration.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -41138,33 +41261,33 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id96" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id96');"
+                           <div class="floatRight"><input id="button_diagram_id99" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id99');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id96" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html160.jpeg"
-                                   usemap="#kiwi_46_html160" /><map name="kiwi_46_html160" id="kiwi_46_html160">
-                                 <area alt="kiwi0.tmp#id98" href="kiwi0.html#id98" coords="215,47,365,73" />
-                                 <area alt="kiwi0.tmp#id97" href="kiwi0.html#id97" coords="201,3,427,29" />
-                                 <area alt="kiwi0.tmp#id101" href="kiwi0.html#id101" coords="215,142,351,168" />
-                                 <area alt="kiwi0.tmp#id100" href="kiwi0.html#id100" coords="201,98,413,124" />
-                                 <area alt="kiwi0.tmp#id103" href="kiwi0.html#id103" coords="198,190,259,214" /></map></div>
+                           <div id="diagram_id99" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html179.jpeg"
+                                   usemap="#kiwi_46_html179" /><map name="kiwi_46_html179" id="kiwi_46_html179">
+                                 <area alt="kiwi0.tmp#id101" href="kiwi0.html#id101" coords="215,47,365,73" />
+                                 <area alt="kiwi0.tmp#id100" href="kiwi0.html#id100" coords="201,3,427,29" />
+                                 <area alt="kiwi0.tmp#id104" href="kiwi0.html#id104" coords="215,142,351,168" />
+                                 <area alt="kiwi0.tmp#id103" href="kiwi0.html#id103" coords="201,98,413,124" />
+                                 <area alt="kiwi0.tmp#id106" href="kiwi0.html#id106" coords="198,190,259,214" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id96" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id96');"
+                           <div class="floatRight"><input id="button_usedBy_id99" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id99');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id96" style="display:block">
+                           <div id="usedBy_id99" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id95" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id98" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">configuration</a></b></td>
                                  </tr>
                               </table>
@@ -41174,13 +41297,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id96" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id99" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id96');"
+                                     onclick="switchState('attributes_id99');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id96" style="display:block">
+                           <div id="attributes_id99" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -41193,7 +41316,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id103" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id106" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -41211,7 +41334,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id102" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id105" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">dest</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -41229,7 +41352,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id99" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id102" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -41246,12 +41369,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id96" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id96');"
+                           <div class="floatRight"><input id="button_source_id99" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id99');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id96" style="display:block">
+                           <div id="source_id99" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -41279,7 +41402,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id97"></a><div class="componentTitle">Attribute Group <span class="qname">k.configuration.source.attribute</span></div>
+      </table><a id="id100"></a><div class="componentTitle">Attribute Group <span class="qname">k.configuration.source.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -41298,30 +41421,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id97" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id97');"
+                           <div class="floatRight"><input id="button_diagram_id100" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id100');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id97" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html243.jpeg"
-                                   usemap="#kiwi_46_html243" /><map name="kiwi_46_html243" id="kiwi_46_html243">
-                                 <area alt="kiwi0.tmp#id99" href="kiwi0.html#id99" coords="268,44,342,68" />
-                                 <area alt="kiwi0.tmp#id98" href="kiwi0.html#id98" coords="257,3,407,29" /></map></div>
+                           <div id="diagram_id100" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html198.jpeg"
+                                   usemap="#kiwi_46_html198" /><map name="kiwi_46_html198" id="kiwi_46_html198">
+                                 <area alt="kiwi0.tmp#id102" href="kiwi0.html#id102" coords="268,44,342,68" />
+                                 <area alt="kiwi0.tmp#id101" href="kiwi0.html#id101" coords="257,3,407,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id97" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id97');"
+                           <div class="floatRight"><input id="button_usedBy_id100" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id100');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id97" style="display:block">
+                           <div id="usedBy_id100" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id96" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id99" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -41331,13 +41454,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id97" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id100" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id97');"
+                                     onclick="switchState('attributes_id100');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id97" style="display:block">
+                           <div id="attributes_id100" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -41350,7 +41473,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id99" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id102" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -41367,12 +41490,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id97" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id97');"
+                           <div class="floatRight"><input id="button_source_id100" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id100');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id97" style="display:block">
+                           <div id="source_id100" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -41394,7 +41517,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id98"></a><div class="componentTitle">Attribute Group <span class="qname">k.source.attribute</span></div>
+      </table><a id="id101"></a><div class="componentTitle">Attribute Group <span class="qname">k.source.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -41413,30 +41536,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id98" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id98');"
+                           <div class="floatRight"><input id="button_diagram_id101" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id101');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id98" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html155.jpeg"
-                                   usemap="#kiwi_46_html155" /><map name="kiwi_46_html155" id="kiwi_46_html155">
-                                 <area alt="kiwi0.tmp#id99" href="kiwi0.html#id99" coords="178,1,252,25" /></map></div>
+                           <div id="diagram_id101" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html128.jpeg"
+                                   usemap="#kiwi_46_html128" /><map name="kiwi_46_html128" id="kiwi_46_html128">
+                                 <area alt="kiwi0.tmp#id102" href="kiwi0.html#id102" coords="178,1,252,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id98" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id98');"
+                           <div class="floatRight"><input id="button_usedBy_id101" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id101');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id98" style="display:block">
+                           <div id="usedBy_id101" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Groups </td>
-                                    <td><b><a href="kiwi0.html#id97" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.source.attribute</a></b>, <b><a href="kiwi0.html#id369" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id100" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.source.attribute</a></b>, <b><a href="kiwi0.html#id362" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.source.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -41446,13 +41569,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id98" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id101" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id98');"
+                                     onclick="switchState('attributes_id101');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id98" style="display:block">
+                           <div id="attributes_id101" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -41465,7 +41588,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id99" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id102" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -41482,12 +41605,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id98" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id98');"
+                           <div class="floatRight"><input id="button_source_id101" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id101');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id98" style="display:block">
+                           <div id="source_id101" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -41509,7 +41632,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id100"></a><div class="componentTitle">Attribute Group <span class="qname">k.configuration.dest.attribute</span></div>
+      </table><a id="id103"></a><div class="componentTitle">Attribute Group <span class="qname">k.configuration.dest.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -41528,30 +41651,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id100" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id100');"
+                           <div class="floatRight"><input id="button_diagram_id103" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id103');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id100" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html224.jpeg"
-                                   usemap="#kiwi_46_html224" /><map name="kiwi_46_html224" id="kiwi_46_html224">
-                                 <area alt="kiwi0.tmp#id102" href="kiwi0.html#id102" coords="254,44,315,68" />
-                                 <area alt="kiwi0.tmp#id101" href="kiwi0.html#id101" coords="243,3,379,29" /></map></div>
+                           <div id="diagram_id103" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html75.jpeg" usemap="#kiwi_46_html75" /><map name="kiwi_46_html75" id="kiwi_46_html75">
+                                 <area alt="kiwi0.tmp#id105" href="kiwi0.html#id105" coords="254,44,315,68" />
+                                 <area alt="kiwi0.tmp#id104" href="kiwi0.html#id104" coords="243,3,379,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id100" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id100');"
+                           <div class="floatRight"><input id="button_usedBy_id103" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id103');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id100" style="display:block">
+                           <div id="usedBy_id103" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id96" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id99" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -41561,13 +41683,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id100" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id103" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id100');"
+                                     onclick="switchState('attributes_id103');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id100" style="display:block">
+                           <div id="attributes_id103" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -41580,7 +41702,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id102" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id105" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">dest</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -41604,12 +41726,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id100" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id100');"
+                           <div class="floatRight"><input id="button_source_id103" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id103');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id100" style="display:block">
+                           <div id="source_id103" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -41631,7 +41753,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id101"></a><div class="componentTitle">Attribute Group <span class="qname">k.dest.attribute</span></div>
+      </table><a id="id104"></a><div class="componentTitle">Attribute Group <span class="qname">k.dest.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -41650,28 +41772,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id101" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id101');"
+                           <div class="floatRight"><input id="button_diagram_id104" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id104');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id101" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html67.jpeg" usemap="#kiwi_46_html67" /><map name="kiwi_46_html67" id="kiwi_46_html67">
-                                 <area alt="kiwi0.tmp#id102" href="kiwi0.html#id102" coords="164,1,225,25" /></map></div>
+                           <div id="diagram_id104" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html158.jpeg"
+                                   usemap="#kiwi_46_html158" /><map name="kiwi_46_html158" id="kiwi_46_html158">
+                                 <area alt="kiwi0.tmp#id105" href="kiwi0.html#id105" coords="164,1,225,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id101" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id101');"
+                           <div class="floatRight"><input id="button_usedBy_id104" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id104');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id101" style="display:block">
+                           <div id="usedBy_id104" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id100" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id103" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.dest.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -41681,13 +41804,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id101" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id104" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id101');"
+                                     onclick="switchState('attributes_id104');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id101" style="display:block">
+                           <div id="attributes_id104" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -41700,7 +41823,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id102" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id105" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">dest</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -41724,12 +41847,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id101" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id101');"
+                           <div class="floatRight"><input id="button_source_id104" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id104');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id101" style="display:block">
+                           <div id="source_id104" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -41755,7 +41878,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id104"></a><div class="componentTitle">Attribute Group <span class="qname">k.pxedeploy.attlist</span></div>
+      </table><a id="id107"></a><div class="componentTitle">Attribute Group <span class="qname">k.pxedeploy.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -41774,29 +41897,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id104" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id104');"
+                           <div class="floatRight"><input id="button_diagram_id107" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id107');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id104" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html31.jpeg" usemap="#kiwi_46_html31" /><map name="kiwi_46_html31" id="kiwi_46_html31">
-                                 <area alt="kiwi0.tmp#id105" href="kiwi0.html#id105" coords="181,0,252,24" />
-                                 <area alt="kiwi0.tmp#id106" href="kiwi0.html#id106" coords="181,34,367,76" /></map></div>
+                           <div id="diagram_id107" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html269.jpeg"
+                                   usemap="#kiwi_46_html269" /><map name="kiwi_46_html269" id="kiwi_46_html269">
+                                 <area alt="kiwi0.tmp#id108" href="kiwi0.html#id108" coords="181,0,252,24" />
+                                 <area alt="kiwi0.tmp#id109" href="kiwi0.html#id109" coords="181,34,367,76" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id104" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id104');"
+                           <div class="floatRight"><input id="button_usedBy_id107" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id107');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id104" style="display:block">
+                           <div id="usedBy_id107" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b></td>
                                  </tr>
                               </table>
@@ -41806,13 +41930,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id104" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id107" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id104');"
+                                     onclick="switchState('attributes_id107');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id104" style="display:block">
+                           <div id="attributes_id107" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -41825,7 +41949,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id106" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id109" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">blocksize</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -41843,7 +41967,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id105" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id108" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">server</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -41867,12 +41991,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id104" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id104');"
+                           <div class="floatRight"><input id="button_source_id107" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id107');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id104" style="display:block">
+                           <div id="source_id107" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -41903,7 +42027,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id108"></a><div class="componentTitle">Attribute Group <span class="qname">k.size.attlist</span></div>
+      </table><a id="id111"></a><div class="componentTitle">Attribute Group <span class="qname">k.size.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -41922,30 +42046,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id108" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id108');"
+                           <div class="floatRight"><input id="button_diagram_id111" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id111');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id108" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html262.jpeg"
-                                   usemap="#kiwi_46_html262" /><map name="kiwi_46_html262" id="kiwi_46_html262">
-                                 <area alt="kiwi0.tmp#id109" href="kiwi0.html#id109" coords="146,0,336,42" />
-                                 <area alt="kiwi0.tmp#id110" href="kiwi0.html#id110" coords="146,52,270,94" /></map></div>
+                           <div id="diagram_id111" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html30.jpeg" usemap="#kiwi_46_html30" /><map name="kiwi_46_html30" id="kiwi_46_html30">
+                                 <area alt="kiwi0.tmp#id112" href="kiwi0.html#id112" coords="146,0,336,42" />
+                                 <area alt="kiwi0.tmp#id113" href="kiwi0.html#id113" coords="146,52,270,94" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id108" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id108');"
+                           <div class="floatRight"><input id="button_usedBy_id111" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id111');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id108" style="display:block">
+                           <div id="usedBy_id111" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id107" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id110" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b></td>
                                  </tr>
                               </table>
@@ -41955,13 +42078,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id108" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id111" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id108');"
+                                     onclick="switchState('attributes_id111');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id108" style="display:block">
+                           <div id="attributes_id111" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -41974,7 +42097,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id110" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id113" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">additive</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -41985,7 +42108,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id109" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id112" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">unit</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -42009,12 +42132,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id108" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id108');"
+                           <div class="floatRight"><input id="button_source_id111" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id111');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id108" style="display:block">
+                           <div id="source_id111" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -42047,7 +42170,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id114"></a><div class="componentTitle">Attribute Group <span class="qname">k.except.attlist</span></div>
+      </table><a id="id117"></a><div class="componentTitle">Attribute Group <span class="qname">k.except.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -42066,30 +42189,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id114" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id114');"
+                           <div class="floatRight"><input id="button_diagram_id117" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id117');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id114" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html218.jpeg"
-                                   usemap="#kiwi_46_html218" /><map name="kiwi_46_html218" id="kiwi_46_html218">
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="178,47,320,73" />
-                                 <area alt="kiwi0.tmp#id115" href="kiwi0.html#id115" coords="164,3,345,29" /></map></div>
+                           <div id="diagram_id117" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html210.jpeg"
+                                   usemap="#kiwi_46_html210" /><map name="kiwi_46_html210" id="kiwi_46_html210">
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="178,47,320,73" />
+                                 <area alt="kiwi0.tmp#id118" href="kiwi0.html#id118" coords="164,3,345,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id114" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id114');"
+                           <div class="floatRight"><input id="button_usedBy_id117" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id117');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id114" style="display:block">
+                           <div id="usedBy_id117" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id113" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b></td>
                                  </tr>
                               </table>
@@ -42099,13 +42222,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id114" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id117" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id114');"
+                                     onclick="switchState('attributes_id117');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id114" style="display:block">
+                           <div id="attributes_id117" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -42118,7 +42241,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -42142,12 +42265,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id114" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id114');"
+                           <div class="floatRight"><input id="button_source_id117" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id117');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id114" style="display:block">
+                           <div id="source_id117" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -42169,7 +42292,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id115"></a><div class="componentTitle">Attribute Group <span class="qname">k.except.name.attribute</span></div>
+      </table><a id="id118"></a><div class="componentTitle">Attribute Group <span class="qname">k.except.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -42188,30 +42311,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id115" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id115');"
+                           <div class="floatRight"><input id="button_diagram_id118" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id118');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id115" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html194.jpeg"
-                                   usemap="#kiwi_46_html194" /><map name="kiwi_46_html194" id="kiwi_46_html194">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="223,44,289,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="212,3,354,29" /></map></div>
+                           <div id="diagram_id118" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html265.jpeg"
+                                   usemap="#kiwi_46_html265" /><map name="kiwi_46_html265" id="kiwi_46_html265">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="223,44,289,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="212,3,354,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id115" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id115');"
+                           <div class="floatRight"><input id="button_usedBy_id118" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id118');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id115" style="display:block">
+                           <div id="usedBy_id118" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id114" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id117" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.except.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -42221,13 +42344,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id115" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id118" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id115');"
+                                     onclick="switchState('attributes_id118');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id115" style="display:block">
+                           <div id="attributes_id118" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -42240,7 +42363,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -42264,12 +42387,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id115" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id115');"
+                           <div class="floatRight"><input id="button_source_id118" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id118');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id115" style="display:block">
+                           <div id="source_id118" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -42291,7 +42414,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id117"></a><div class="componentTitle">Attribute Group <span class="qname">k.file.attlist</span></div>
+      </table><a id="id119"></a><div class="componentTitle">Attribute Group <span class="qname">k.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -42310,32 +42433,44 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id117" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id117');"
+                           <div class="floatRight"><input id="button_diagram_id119" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id119');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id117" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html281.jpeg"
-                                   usemap="#kiwi_46_html281" /><map name="kiwi_46_html281" id="kiwi_46_html281">
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="158,47,300,73" />
-                                 <area alt="kiwi0.tmp#id118" href="kiwi0.html#id118" coords="144,3,305,29" />
-                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="141,95,202,119" /></map></div>
+                           <div id="diagram_id119" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html283.jpeg"
+                                   usemap="#kiwi_46_html283" /><map name="kiwi_46_html283" id="kiwi_46_html283">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="170,1,236,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id117" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id117');"
+                           <div class="floatRight"><input id="button_usedBy_id119" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id119');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id117" style="display:block">
+                           <div id="usedBy_id119" style="display:block">
                               <table class="usedByTable">
                                  <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">file</a></b></td>
+                                    <td class="firstColumn">Attribute Groups </td>
+                                    <td><b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.name.attribute</a></b>, <b><a href="kiwi0.html#id319" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.name.attribute</a></b>, <b><a href="kiwi0.html#id118" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.except.name.attribute</a></b>, <b><a href="kiwi0.html#id123" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.name.attribute</a></b>, <b><a href="kiwi0.html#id316" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.ignore.name.attribute</a></b>, <b><a href="kiwi0.html#id304" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.name.attribute</a></b>, <b><a href="kiwi0.html#id312" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.name.attribute</a></b>, <b><a href="kiwi0.html#id297" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.name.attribute</a></b>, <b><a href="kiwi0.html#id221" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productinfo.attlist</a></b>, <b><a href="kiwi0.html#id219" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productoption.attlist</a></b>, <b><a href="kiwi0.html#id223" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productvar.attlist</a></b>, <b><a href="kiwi0.html#id200" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.name.attribute</a></b>, <b><a href="kiwi0.html#id242" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.name.attribute</a></b>, <b><a href="kiwi0.html#id308" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.name.attribute</a></b>, <b><a href="kiwi0.html#id267" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.name.attribute</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -42344,13 +42479,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id117" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id119" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id117');"
+                                     onclick="switchState('attributes_id119');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id117" style="display:block">
+                           <div id="attributes_id119" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -42363,25 +42498,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id119" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation">
-                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                                 class="preWrapContainer">
-                                             <tr>
-                                                <td width="100%"><pre><span class="tokenText">An architecture</span></pre></td>
-                                             </tr>
-                                          </table>
-                                       </div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -42405,20 +42522,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id117" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id117');"
+                           <div class="floatRight"><input id="button_source_id119" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id119');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id117" style="display:block">
+                           <div id="source_id119" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.file.attlist"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.file.name.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"arch"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.name.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">An architecture</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">A name</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
@@ -42437,129 +42553,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id118"></a><div class="componentTitle">Attribute Group <span class="qname">k.file.name.attribute</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id118" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id118');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id118" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html241.jpeg"
-                                   usemap="#kiwi_46_html241" /><map name="kiwi_46_html241" id="kiwi_46_html241">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="203,44,269,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="192,3,334,29" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id118" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id118');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id118" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id117" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.attlist</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id118" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id118');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id118" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation">
-                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                                 class="preWrapContainer">
-                                             <tr>
-                                                <td width="100%"><pre><span class="tokenText">A name</span></pre></td>
-                                             </tr>
-                                          </table>
-                                       </div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id118" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id118');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id118" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.file.name.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.name.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
-</span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id123"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwarenic.attlist</span></div>
+      </table><a id="id122"></a><div class="componentTitle">Attribute Group <span class="qname">k.file.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -42578,35 +42572,32 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id123" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id123');"
+                           <div class="floatRight"><input id="button_diagram_id122" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id122');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id123" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html184.jpeg"
-                                   usemap="#kiwi_46_html184" /><map name="kiwi_46_html184" id="kiwi_46_html184">
-                                 <area alt="kiwi0.tmp#id125" href="kiwi0.html#id125" coords="196,44,265,68" />
-                                 <area alt="kiwi0.tmp#id124" href="kiwi0.html#id124" coords="185,3,390,29" />
-                                 <area alt="kiwi0.tmp#id127" href="kiwi0.html#id127" coords="196,129,382,171" />
-                                 <area alt="kiwi0.tmp#id126" href="kiwi0.html#id126" coords="185,88,405,114" />
-                                 <area alt="kiwi0.tmp#id129" href="kiwi0.html#id129" coords="196,232,263,256" />
-                                 <area alt="kiwi0.tmp#id128" href="kiwi0.html#id128" coords="185,191,388,217" /></map></div>
+                           <div id="diagram_id122" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html171.jpeg"
+                                   usemap="#kiwi_46_html171" /><map name="kiwi_46_html171" id="kiwi_46_html171">
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="158,47,300,73" />
+                                 <area alt="kiwi0.tmp#id123" href="kiwi0.html#id123" coords="144,3,305,29" />
+                                 <area alt="kiwi0.tmp#id124" href="kiwi0.html#id124" coords="141,95,202,119" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id123" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id123');"
+                           <div class="floatRight"><input id="button_usedBy_id122" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id122');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id123" style="display:block">
+                           <div id="usedBy_id122" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id122" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwarenic</a></b></td>
+                                    <td><b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">file</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -42615,13 +42606,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id123" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id122" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id123');"
+                                     onclick="switchState('attributes_id122');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id123" style="display:block">
+                           <div id="attributes_id122" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -42634,166 +42625,26 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id125" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">driver</a></b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation">
-                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                                 class="preWrapContainer">
-                                             <tr>
-                                                <td width="100%"><pre><span class="tokenText">The driver used for the VM network interface</span></pre></td>
-                                             </tr>
-                                          </table>
-                                       </div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id127" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">interface</a></b></td>
-                                    <td><b>xs:nonNegativeInteger</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation">
-                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                                 class="preWrapContainer">
-                                             <tr>
-                                                <td width="100%"><pre><span class="tokenText">The interface ID for the VM network interface</span></pre></td>
-                                             </tr>
-                                          </table>
-                                       </div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id129" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mode</a></b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id124" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
                                     <td></td>
-                                    <td>required</td>
+                                    <td>optional</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The VM network mode</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">An architecture</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id123" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id123');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id123" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwarenic.attlist"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmwarenic.driver.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmwarenic.interface.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmwarenic.mode.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
-</span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id124"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwarenic.driver.attribute</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id124" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id124');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id124" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html42.jpeg" usemap="#kiwi_46_html42" /><map name="kiwi_46_html42" id="kiwi_46_html42">
-                                 <area alt="kiwi0.tmp#id125" href="kiwi0.html#id125" coords="233,1,302,25" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id124" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id124');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id124" style="display:block">
-                              <table class="usedByTable">
                                  <tr>
-                                    <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id123" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.attlist</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id124" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id124');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id124" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id125" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">driver</a></b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
                                     <td></td>
@@ -42803,7 +42654,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The driver used for the VM network interface</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">A name</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -42816,19 +42667,20 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id124" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id124');"
+                           <div class="floatRight"><input id="button_source_id122" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id122');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id124" style="display:block">
+                           <div id="source_id122" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwarenic.driver.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"driver"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.file.attlist"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.file.name.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"arch"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The driver used for the VM network interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">An architecture</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
@@ -42847,7 +42699,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id126"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwarenic.interface.attribute</span></div>
+      </table><a id="id123"></a><div class="componentTitle">Attribute Group <span class="qname">k.file.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -42866,29 +42718,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id126" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id126');"
+                           <div class="floatRight"><input id="button_diagram_id123" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id123');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id126" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html96.jpeg" usemap="#kiwi_46_html96" /><map name="kiwi_46_html96" id="kiwi_46_html96">
-                                 <area alt="kiwi0.tmp#id127" href="kiwi0.html#id127" coords="248,0,434,42" /></map></div>
+                           <div id="diagram_id123" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html78.jpeg" usemap="#kiwi_46_html78" /><map name="kiwi_46_html78" id="kiwi_46_html78">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="203,44,269,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="192,3,334,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id126" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id126');"
+                           <div class="floatRight"><input id="button_usedBy_id123" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id123');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id126" style="display:block">
+                           <div id="usedBy_id123" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id123" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.attlist</a></b></td>
+                                    <td><b><a href="kiwi0.html#id122" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -42897,13 +42750,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id126" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id123" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id126');"
+                                     onclick="switchState('attributes_id123');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id126" style="display:block">
+                           <div id="attributes_id123" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -42916,9 +42769,9 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id127" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">interface</a></b></td>
-                                    <td><b>xs:nonNegativeInteger</b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
+                                    <td></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -42927,7 +42780,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The interface ID for the VM network interface</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">A name</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -42940,21 +42793,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id126" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id126');"
+                           <div class="floatRight"><input id="button_source_id123" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id123');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id126" style="display:block">
+                           <div id="source_id123" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwarenic.interface.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"interface"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:nonNegativeInteger"</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The interface ID for the VM network interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.file.name.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.name.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
                                  </tr>
                               </table>
@@ -42971,7 +42820,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id128"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwarenic.mode.attribute</span></div>
+      </table><a id="id128"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmnic.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -42995,9 +42844,12 @@
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id128" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html117.jpeg"
-                                   usemap="#kiwi_46_html117" /><map name="kiwi_46_html117" id="kiwi_46_html117">
-                                 <area alt="kiwi0.tmp#id129" href="kiwi0.html#id129" coords="231,1,298,25" /></map></div>
+                           <div id="diagram_id128" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html82.jpeg" usemap="#kiwi_46_html82" /><map name="kiwi_46_html82" id="kiwi_46_html82">
+                                 <area alt="kiwi0.tmp#id129" href="kiwi0.html#id129" coords="157,0,226,24" />
+                                 <area alt="kiwi0.tmp#id131" href="kiwi0.html#id131" coords="171,78,255,102" />
+                                 <area alt="kiwi0.tmp#id130" href="kiwi0.html#id130" coords="160,37,355,63" />
+                                 <area alt="kiwi0.tmp#id132" href="kiwi0.html#id132" coords="157,119,224,143" />
+                                 <area alt="kiwi0.tmp#id133" href="kiwi0.html#id133" coords="157,153,218,177" /></map></div>
                         </td>
                      </tr>
                      <tr>
@@ -43011,9 +42863,9 @@
                            <div id="usedBy_id128" style="display:block">
                               <table class="usedByTable">
                                  <tr>
-                                    <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id123" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.attlist</a></b></td>
+                                    <td class="firstColumn">Element </td>
+                                    <td><b><a href="kiwi0.html#id127" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmnic</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -43042,136 +42894,26 @@
                                  </thead>
                                  <tr>
                                     <td class="firstColumn"><b><a href="kiwi0.html#id129" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mode</a></b></td>
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">driver</a></b></td>
                                     <td></td>
                                     <td></td>
                                     <td></td>
-                                    <td>required</td>
+                                    <td>optional</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The VM network mode</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The driver used for the VM network interface</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id128" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id128');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id128" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwarenic.mode.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mode"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VM network mode</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
-</span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id131"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwaredisk.attlist</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id131" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id131');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id131" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html248.jpeg"
-                                   usemap="#kiwi_46_html248" /><map name="kiwi_46_html248" id="kiwi_46_html248">
-                                 <area alt="kiwi0.tmp#id133" href="kiwi0.html#id133" coords="202,44,392,86" />
-                                 <area alt="kiwi0.tmp#id132" href="kiwi0.html#id132" coords="191,3,423,29" />
-                                 <area alt="kiwi0.tmp#id135" href="kiwi0.html#id135" coords="202,147,388,189" />
-                                 <area alt="kiwi0.tmp#id134" href="kiwi0.html#id134" coords="191,106,380,132" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id131" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id131');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id131" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id130" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwaredisk</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id131" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id131');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id131" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id133" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">controller</a></b></td>
-                                    <td>restriction of <b>xs:token</b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id131" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">interface</a></b></td>
+                                    <td></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -43180,146 +42922,43 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The disk controller used for the VMware guest</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The interface ID for the VM network interface</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id135" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
-                                    <td><b>xs:nonNegativeInteger</b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id133" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mac</a></b></td>
                                     <td></td>
                                     <td></td>
-                                    <td>required</td>
+                                    <td></td>
+                                    <td>optional</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The disk ID for the VM disk</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The VM mac address</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id131" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id131');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id131" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwaredisk.attlist"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmwaredisk.controller.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmwaredisk.id.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
-</span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id132"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwaredisk.controller.attribute</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id132" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id132');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id132" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html22.jpeg" usemap="#kiwi_46_html22" /><map name="kiwi_46_html22" id="kiwi_46_html22">
-                                 <area alt="kiwi0.tmp#id133" href="kiwi0.html#id133" coords="260,0,450,42" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id132" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id132');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id132" style="display:block">
-                              <table class="usedByTable">
                                  <tr>
-                                    <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id131" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.attlist</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id132" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id132');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id132" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id133" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">controller</a></b></td>
-                                    <td>restriction of <b>xs:token</b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id132" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mode</a></b></td>
                                     <td></td>
                                     <td></td>
-                                    <td>required</td>
+                                    <td></td>
+                                    <td>optional</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The disk controller used for the VMware guest</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The VM network mode</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -43332,26 +42971,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id132" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id132');"
+                           <div class="floatRight"><input id="button_source_id128" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id128');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id132" style="display:block">
+                           <div id="source_id128" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwaredisk.controller.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"controller"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmnic.attlist"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"driver"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk controller used for the VMware guest</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The driver used for the VM network interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmnic.interface.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mode"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VM network mode</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mac"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VM mac address</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ide"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"scsi"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
                                  </tr>
@@ -43369,7 +43013,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id134"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwaredisk.id.attribute</span></div>
+      </table><a id="id130"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmnic.interface.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -43388,30 +43032,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id134" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id134');"
+                           <div class="floatRight"><input id="button_diagram_id130" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id130');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id134" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html279.jpeg"
-                                   usemap="#kiwi_46_html279" /><map name="kiwi_46_html279" id="kiwi_46_html279">
-                                 <area alt="kiwi0.tmp#id135" href="kiwi0.html#id135" coords="217,0,403,42" /></map></div>
+                           <div id="diagram_id130" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html74.jpeg" usemap="#kiwi_46_html74" /><map name="kiwi_46_html74" id="kiwi_46_html74">
+                                 <area alt="kiwi0.tmp#id131" href="kiwi0.html#id131" coords="223,1,307,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id134" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id134');"
+                           <div class="floatRight"><input id="button_usedBy_id130" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id130');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id134" style="display:block">
+                           <div id="usedBy_id130" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id131" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.attlist</a></b></td>
+                                    <td><b><a href="kiwi0.html#id128" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -43420,13 +43063,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id134" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id130" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id134');"
+                                     onclick="switchState('attributes_id130');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id134" style="display:block">
+                           <div id="attributes_id130" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -43439,9 +43082,9 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id135" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
-                                    <td><b>xs:nonNegativeInteger</b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id131" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">interface</a></b></td>
+                                    <td></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -43450,7 +43093,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The disk ID for the VM disk</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The interface ID for the VM network interface</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -43463,19 +43106,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id134" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id134');"
+                           <div class="floatRight"><input id="button_source_id130" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id130');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id134" style="display:block">
+                           <div id="source_id130" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwaredisk.id.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"id"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:nonNegativeInteger"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmnic.interface.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"interface"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk ID for the VM disk</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The interface ID for the VM network interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
@@ -43494,7 +43137,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id137"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwarecdrom.attlist</span></div>
+      </table><a id="id135"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmdisk.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -43513,33 +43156,34 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id137" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id137');"
+                           <div class="floatRight"><input id="button_diagram_id135" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id135');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id137" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html225.jpeg"
-                                   usemap="#kiwi_46_html225" /><map name="kiwi_46_html225" id="kiwi_46_html225">
-                                 <area alt="kiwi0.tmp#id139" href="kiwi0.html#id139" coords="215,44,405,86" />
-                                 <area alt="kiwi0.tmp#id138" href="kiwi0.html#id138" coords="204,3,449,29" />
-                                 <area alt="kiwi0.tmp#id141" href="kiwi0.html#id141" coords="215,147,401,189" />
-                                 <area alt="kiwi0.tmp#id140" href="kiwi0.html#id140" coords="204,106,406,132" /></map></div>
+                           <div id="diagram_id135" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html276.jpeg"
+                                   usemap="#kiwi_46_html276" /><map name="kiwi_46_html276" id="kiwi_46_html276">
+                                 <area alt="kiwi0.tmp#id137" href="kiwi0.html#id137" coords="177,44,367,86" />
+                                 <area alt="kiwi0.tmp#id136" href="kiwi0.html#id136" coords="166,3,373,29" />
+                                 <area alt="kiwi0.tmp#id139" href="kiwi0.html#id139" coords="177,147,363,189" />
+                                 <area alt="kiwi0.tmp#id138" href="kiwi0.html#id138" coords="166,106,330,132" />
+                                 <area alt="kiwi0.tmp#id140" href="kiwi0.html#id140" coords="163,206,234,230" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id137" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id137');"
+                           <div class="floatRight"><input id="button_usedBy_id135" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id135');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id137" style="display:block">
+                           <div id="usedBy_id135" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id136" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwarecdrom</a></b></td>
+                                    <td><b><a href="kiwi0.html#id134" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmdisk</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -43548,13 +43192,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id137" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id135" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id137');"
+                                     onclick="switchState('attributes_id135');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id137" style="display:block">
+                           <div id="attributes_id135" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -43567,7 +43211,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id139" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id137" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">controller</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -43578,14 +43222,32 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The CD/DVD controller used for the VMware guest</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The disk controller used for the VM guest</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id141" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id140" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">device</a></b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>optional</td>
+                                    <td>
+                                       <div class="annotation">
+                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                                 class="preWrapContainer">
+                                             <tr>
+                                                <td width="100%"><pre><span class="tokenText">The disk device to appear in the guest (xen only)</span></pre></td>
+                                             </tr>
+                                          </table>
+                                       </div>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id139" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -43596,7 +43258,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The CD/DVD ID for the VM CD rom drive</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The disk ID / device for the VM disk</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -43609,18 +43271,23 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id137" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id137');"
+                           <div class="floatRight"><input id="button_source_id135" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id135');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id137" style="display:block">
+                           <div id="source_id135" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwarecdrom.attlist"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmwarecdrom.controller.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmwarecdrom.id.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmdisk.attlist"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmdisk.controller.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmdisk.id.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"device"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk device to appear in the guest (xen only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
                                  </tr>
                               </table>
@@ -43637,7 +43304,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id138"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwarecdrom.controller.attribute</span></div>
+      </table><a id="id136"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmdisk.controller.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -43656,30 +43323,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id138" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id138');"
+                           <div class="floatRight"><input id="button_diagram_id136" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id136');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id138" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html195.jpeg"
-                                   usemap="#kiwi_46_html195" /><map name="kiwi_46_html195" id="kiwi_46_html195">
-                                 <area alt="kiwi0.tmp#id139" href="kiwi0.html#id139" coords="273,0,463,42" /></map></div>
+                           <div id="diagram_id136" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html168.jpeg"
+                                   usemap="#kiwi_46_html168" /><map name="kiwi_46_html168" id="kiwi_46_html168">
+                                 <area alt="kiwi0.tmp#id137" href="kiwi0.html#id137" coords="235,0,425,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id138" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id138');"
+                           <div class="floatRight"><input id="button_usedBy_id136" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id136');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id138" style="display:block">
+                           <div id="usedBy_id136" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id137" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.attlist</a></b></td>
+                                    <td><b><a href="kiwi0.html#id135" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -43688,13 +43355,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id138" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id136" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id138');"
+                                     onclick="switchState('attributes_id136');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id138" style="display:block">
+                           <div id="attributes_id136" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -43707,7 +43374,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id139" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id137" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">controller</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -43718,7 +43385,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The CD/DVD controller used for the VMware guest</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The disk controller used for the VM guest</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -43731,19 +43398,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id138" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id138');"
+                           <div class="floatRight"><input id="button_source_id136" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id136');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id138" style="display:block">
+                           <div id="source_id136" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwarecdrom.controller.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmdisk.controller.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"controller"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The CD/DVD controller used for the VMware guest</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk controller used for the VM guest</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
@@ -43768,7 +43435,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id140"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwarecdrom.id.attribute</span></div>
+      </table><a id="id138"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmdisk.id.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -43787,29 +43454,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id140" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id140');"
+                           <div class="floatRight"><input id="button_diagram_id138" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id138');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id140" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html3.jpeg" usemap="#kiwi_46_html3" /><map name="kiwi_46_html3" id="kiwi_46_html3">
-                                 <area alt="kiwi0.tmp#id141" href="kiwi0.html#id141" coords="230,0,416,42" /></map></div>
+                           <div id="diagram_id138" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html244.jpeg"
+                                   usemap="#kiwi_46_html244" /><map name="kiwi_46_html244" id="kiwi_46_html244">
+                                 <area alt="kiwi0.tmp#id139" href="kiwi0.html#id139" coords="192,0,378,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id140" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id140');"
+                           <div class="floatRight"><input id="button_usedBy_id138" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id138');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id140" style="display:block">
+                           <div id="usedBy_id138" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id137" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.attlist</a></b></td>
+                                    <td><b><a href="kiwi0.html#id135" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -43818,13 +43486,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id140" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id138" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id140');"
+                                     onclick="switchState('attributes_id138');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id140" style="display:block">
+                           <div id="attributes_id138" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -43837,7 +43505,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id141" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id139" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -43848,7 +43516,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The CD/DVD ID for the VM CD rom drive</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The disk ID / device for the VM disk</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -43861,19 +43529,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id140" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id140');"
+                           <div class="floatRight"><input id="button_source_id138" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id138');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id140" style="display:block">
+                           <div id="source_id138" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwarecdrom.id.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmdisk.id.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"id"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:nonNegativeInteger"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The CD/DVD ID for the VM CD rom drive</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk ID / device for the VM disk</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
@@ -43892,7 +43560,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id142"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwareconfig.attlist</span></div>
+      </table><a id="id142"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmdvd.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -43916,13 +43584,12 @@
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id142" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html21.jpeg" usemap="#kiwi_46_html21" /><map name="kiwi_46_html21" id="kiwi_46_html21">
-                                 <area alt="kiwi0.tmp#id143" href="kiwi0.html#id143" coords="200,0,390,42" />
-                                 <area alt="kiwi0.tmp#id144" href="kiwi0.html#id144" coords="200,52,319,94" />
-                                 <area alt="kiwi0.tmp#id145" href="kiwi0.html#id145" coords="200,104,282,128" />
-                                 <area alt="kiwi0.tmp#id146" href="kiwi0.html#id146" coords="200,138,324,180" />
-                                 <area alt="kiwi0.tmp#id148" href="kiwi0.html#id148" coords="214,234,295,258" />
-                                 <area alt="kiwi0.tmp#id147" href="kiwi0.html#id147" coords="203,193,438,219" /></map></div>
+                           <div id="diagram_id142" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html200.jpeg"
+                                   usemap="#kiwi_46_html200" /><map name="kiwi_46_html200" id="kiwi_46_html200">
+                                 <area alt="kiwi0.tmp#id144" href="kiwi0.html#id144" coords="175,44,365,86" />
+                                 <area alt="kiwi0.tmp#id143" href="kiwi0.html#id143" coords="164,3,369,29" />
+                                 <area alt="kiwi0.tmp#id146" href="kiwi0.html#id146" coords="175,147,361,189" />
+                                 <area alt="kiwi0.tmp#id145" href="kiwi0.html#id145" coords="164,106,326,132" /></map></div>
                         </td>
                      </tr>
                      <tr>
@@ -43937,8 +43604,8 @@
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwareconfig</a></b></td>
+                                    <td><b><a href="kiwi0.html#id141" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmdvd</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -43967,71 +43634,17 @@
                                  </thead>
                                  <tr>
                                     <td class="firstColumn"><b><a href="kiwi0.html#id144" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">HWversion</a></b></td>
-                                    <td><b>xs:integer</b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation">
-                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                                 class="preWrapContainer">
-                                             <tr>
-                                                <td width="100%"><pre><span class="tokenText">The virtual HW version number for the VMware configuration</span></pre></td>
-                                             </tr>
-                                          </table>
-                                       </div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id143" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">controller</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
                                     <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation">
-                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                                 class="preWrapContainer">
-                                             <tr>
-                                                <td width="100%"><pre><span class="tokenText">the VMware architecture type</span></pre></td>
-                                             </tr>
-                                          </table>
-                                       </div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id145" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">guestOS</a></b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>optional</td>
-                                    <td>
-                                       <div class="annotation">
-                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                                 class="preWrapContainer">
-                                             <tr>
-                                                <td width="100%"><pre><span class="tokenText">the virtual guestOS identification string for VMware</span></pre></td>
-                                             </tr>
-                                          </table>
-                                       </div>
-                                    </td>
-                                 </tr>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id148" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">memory</a></b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
                                     <td>required</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The memory setup for the guest VM.</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The CD/DVD controller used for the VM guest</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -44039,17 +43652,17 @@
                                  </tr>
                                  <tr>
                                     <td class="firstColumn"><b><a href="kiwi0.html#id146" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">usb</a></b></td>
-                                    <td><b>xs:boolean</b></td>
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
+                                    <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
                                     <td></td>
-                                    <td>optional</td>
+                                    <td>required</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">Activate/Deactivate usb controller for VMware</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The CD/DVD ID for the VM CD rom drive</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -44071,35 +43684,9 @@
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwareconfig.attlist"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"arch"</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the VMware architecture type</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ix86"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"x86_64"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"%arch"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"HWversion"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The virtual HW version number for the VMware configuration</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"guestOS"</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the virtual guestOS identification string for VMware</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"usb"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Activate/Deactivate usb controller for VMware</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmwareconfig.memory.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmdvd.attlist"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmdvd.controller.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.vmdvd.id.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
                                  </tr>
                               </table>
@@ -44116,7 +43703,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id147"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwareconfig.memory.attribute</span></div>
+      </table><a id="id143"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmdvd.controller.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -44135,29 +43722,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id147" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id147');"
+                           <div class="floatRight"><input id="button_diagram_id143" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id143');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id147" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html58.jpeg" usemap="#kiwi_46_html58" /><map name="kiwi_46_html58" id="kiwi_46_html58">
-                                 <area alt="kiwi0.tmp#id148" href="kiwi0.html#id148" coords="263,1,344,25" /></map></div>
+                           <div id="diagram_id143" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html13.jpeg" usemap="#kiwi_46_html13" /><map name="kiwi_46_html13" id="kiwi_46_html13">
+                                 <area alt="kiwi0.tmp#id144" href="kiwi0.html#id144" coords="233,0,423,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id147" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id147');"
+                           <div class="floatRight"><input id="button_usedBy_id143" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id143');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id147" style="display:block">
+                           <div id="usedBy_id143" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
                                     <td><b><a href="kiwi0.html#id142" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.attlist</a></b></td>
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -44166,13 +43753,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id147" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id143" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id147');"
+                                     onclick="switchState('attributes_id143');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id147" style="display:block">
+                           <div id="attributes_id143" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -44185,9 +43772,9 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id148" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">memory</a></b></td>
-                                    <td></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id144" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">controller</a></b></td>
+                                    <td>restriction of <b>xs:token</b></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -44196,7 +43783,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The memory setup for the guest VM.</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The CD/DVD controller used for the VM guest</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -44209,20 +43796,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id147" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id147');"
+                           <div class="floatRight"><input id="button_source_id143" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id143');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id147" style="display:block">
+                           <div id="source_id143" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwareconfig.memory.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"memory"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmdvd.controller.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"controller"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The memory setup for the guest VM.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The CD/DVD controller used for the VM guest</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
+        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ide"</span><span class="tokenElement">/></span><span class="tokenIndent">
+        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"scsi"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
                                  </tr>
@@ -44240,129 +43833,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id151"></a><div class="componentTitle">Attribute Group <span class="qname">k.xendisk.attlist</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id151" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id151');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id151" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html202.jpeg"
-                                   usemap="#kiwi_46_html202" /><map name="kiwi_46_html202" id="kiwi_46_html202">
-                                 <area alt="kiwi0.tmp#id153" href="kiwi0.html#id153" coords="181,44,252,68" />
-                                 <area alt="kiwi0.tmp#id152" href="kiwi0.html#id152" coords="170,3,362,29" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id151" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id151');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id151" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id150" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xendisk</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id151" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id151');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id151" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">device</a></b></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td></td>
-                                    <td>required</td>
-                                    <td>
-                                       <div class="annotation">
-                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                                 class="preWrapContainer">
-                                             <tr>
-                                                <td width="100%"><pre><span class="tokenText">The disk device to appear in the Xen guest</span></pre></td>
-                                             </tr>
-                                          </table>
-                                       </div>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id151" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id151');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id151" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.xendisk.attlist"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.xendisk.device.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
-</span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id152"></a><div class="componentTitle">Attribute Group <span class="qname">k.xendisk.device.attribute</span></div>
+      </table><a id="id145"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmdvd.id.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -44381,30 +43852,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id152" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id152');"
+                           <div class="floatRight"><input id="button_diagram_id145" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id145');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id152" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html138.jpeg"
-                                   usemap="#kiwi_46_html138" /><map name="kiwi_46_html138" id="kiwi_46_html138">
-                                 <area alt="kiwi0.tmp#id153" href="kiwi0.html#id153" coords="220,1,291,25" /></map></div>
+                           <div id="diagram_id145" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html191.jpeg"
+                                   usemap="#kiwi_46_html191" /><map name="kiwi_46_html191" id="kiwi_46_html191">
+                                 <area alt="kiwi0.tmp#id146" href="kiwi0.html#id146" coords="190,0,376,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id152" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id152');"
+                           <div class="floatRight"><input id="button_usedBy_id145" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id145');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id152" style="display:block">
+                           <div id="usedBy_id145" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id151" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xendisk.attlist</a></b></td>
+                                    <td><b><a href="kiwi0.html#id142" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.attlist</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -44413,13 +43884,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id152" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id145" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id152');"
+                                     onclick="switchState('attributes_id145');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id152" style="display:block">
+                           <div id="attributes_id145" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -44432,9 +43903,9 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">device</a></b></td>
-                                    <td></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id146" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
+                                    <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -44443,7 +43914,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The disk device to appear in the Xen guest</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The CD/DVD ID for the VM CD rom drive</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -44456,19 +43927,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id152" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id152');"
+                           <div class="floatRight"><input id="button_source_id145" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id145');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id152" style="display:block">
+                           <div id="source_id145" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.xendisk.device.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"device"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmdvd.id.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"id"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:nonNegativeInteger"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk device to appear in the Xen guest</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The CD/DVD ID for the VM CD rom drive</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
@@ -44487,7 +43958,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id155"></a><div class="componentTitle">Attribute Group <span class="qname">k.xenbridge.attlist</span></div>
+      </table><a id="id147"></a><div class="componentTitle">Attribute Group <span class="qname">k.machine.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -44506,31 +43977,34 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id155" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id155');"
+                           <div class="floatRight"><input id="button_diagram_id147" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id147');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id155" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html49.jpeg" usemap="#kiwi_46_html49" /><map name="kiwi_46_html49" id="kiwi_46_html49">
-                                 <area alt="kiwi0.tmp#id156" href="kiwi0.html#id156" coords="180,0,241,24" />
-                                 <area alt="kiwi0.tmp#id158" href="kiwi0.html#id158" coords="194,78,260,102" />
-                                 <area alt="kiwi0.tmp#id157" href="kiwi0.html#id157" coords="183,37,383,63" /></map></div>
+                           <div id="diagram_id147" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html230.jpeg"
+                                   usemap="#kiwi_46_html230" /><map name="kiwi_46_html230" id="kiwi_46_html230">
+                                 <area alt="kiwi0.tmp#id148" href="kiwi0.html#id148" coords="170,0,360,42" />
+                                 <area alt="kiwi0.tmp#id149" href="kiwi0.html#id149" coords="170,52,289,94" />
+                                 <area alt="kiwi0.tmp#id150" href="kiwi0.html#id150" coords="170,104,252,128" />
+                                 <area alt="kiwi0.tmp#id151" href="kiwi0.html#id151" coords="170,138,251,162" />
+                                 <area alt="kiwi0.tmp#id152" href="kiwi0.html#id152" coords="170,172,360,214" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id155" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id155');"
+                           <div class="floatRight"><input id="button_usedBy_id147" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id147');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id155" style="display:block">
+                           <div id="usedBy_id147" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id154" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenbridge</a></b></td>
+                                    <td><b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">machine</a></b></td>
                                  </tr>
                               </table>
                            </div>
@@ -44539,13 +44013,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id155" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id147" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id155');"
+                                     onclick="switchState('attributes_id147');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id155" style="display:block">
+                           <div id="attributes_id147" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -44558,9 +44032,9 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id156" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mac</a></b></td>
-                                    <td></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id149" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">HWversion</a></b></td>
+                                    <td><b>xs:integer</b></td>
                                     <td></td>
                                     <td></td>
                                     <td>optional</td>
@@ -44569,267 +44043,52 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The Mac address to assign to the virtual interface</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The virtual HW version number for the VM configuration</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id158" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
-                                    <td></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id148" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
+                                    <td>restriction of <b>xs:token</b></td>
                                     <td></td>
                                     <td></td>
-                                    <td>required</td>
+                                    <td>optional</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The Xen bridged interface name</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">the VM architecture type</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id155" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id155');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id155" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
-                                 <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.xenbridge.attlist"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mac"</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The Mac address to assign to the virtual interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.xenbridge.name.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
-</span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id157"></a><div class="componentTitle">Attribute Group <span class="qname">k.xenbridge.name.attribute</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id157" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id157');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id157" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html32.jpeg" usemap="#kiwi_46_html32" /><map name="kiwi_46_html32" id="kiwi_46_html32">
-                                 <area alt="kiwi0.tmp#id158" href="kiwi0.html#id158" coords="228,1,294,25" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id157" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id157');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id157" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id155" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.attlist</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id157" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id157');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id157" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id158" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
-                                    <td></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id152" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">domain</a></b></td>
+                                    <td>restriction of <b>xs:token</b></td>
                                     <td></td>
                                     <td></td>
-                                    <td>required</td>
+                                    <td>optional</td>
                                     <td>
                                        <div class="annotation">
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The Xen bridged interface name</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The domain setup for the VM (xen only)</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id157" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id157');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="source_id157" style="display:block">
-                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
-                                     class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.xenbridge.name.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"name"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The Xen bridged interface name</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
-</span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                  </tbody>
-               </table>
-            </td>
-            <td class="rt_lineRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_cornerBottomLeft"></td>
-            <td class="rt_lineBottom"></td>
-            <td class="rt_cornerBottomRight"></td>
-         </tr>
-      </table><a id="id159"></a><div class="componentTitle">Attribute Group <span class="qname">k.xenconfig.attlist</span></div>
-      <table class="rt">
-         <tr>
-            <td class="rt_cornerTopLeft"></td>
-            <td class="rt_lineTop"></td>
-            <td class="rt_cornerTopRight"></td>
-         </tr>
-         <tr>
-            <td class="rt_lineLeft"></td>
-            <td class="rt_content">
-               <table class="component">
-                  <tbody>
-                     <tr>
-                        <td class="firstColumn"><b>Namespace</b></td>
-                        <td>No namespace</td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id159" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id159');"
-                                     class="control" /></div>
-                        </td>
-                        <td class="diagram">
-                           <div id="diagram_id159" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html249.jpeg"
-                                   usemap="#kiwi_46_html249" /><map name="kiwi_46_html249" id="kiwi_46_html249">
-                                 <area alt="kiwi0.tmp#id160" href="kiwi0.html#id160" coords="179,0,260,24" />
-                                 <area alt="kiwi0.tmp#id161" href="kiwi0.html#id161" coords="179,34,369,76" /></map></div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id159" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id159');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="usedBy_id159" style="display:block">
-                              <table class="usedByTable">
-                                 <tr>
-                                    <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id149" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenconfig</a></b></td>
-                                 </tr>
-                              </table>
-                           </div>
-                        </td>
-                     </tr>
-                     <tr>
-                        <td class="firstColumn">
-                           <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id159" type="image" src="images/button_minus.gif"
-                                     value="-"
-                                     onclick="switchState('attributes_id159');"
-                                     class="control" /></div>
-                        </td>
-                        <td>
-                           <div id="attributes_id159" style="display:block">
-                              <table class="attributesTable">
-                                 <thead>
-                                    <tr>
-                                       <th>QName</th>
-                                       <th>Type</th>
-                                       <th>Fixed</th>
-                                       <th>Default</th>
-                                       <th>Use</th>
-                                       <th>Annotation</th>
-                                    </tr>
-                                 </thead>
-                                 <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id161" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">domain</a></b></td>
-                                    <td>restriction of <b>xs:token</b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id150" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">guestOS</a></b></td>
+                                    <td></td>
                                     <td></td>
                                     <td></td>
                                     <td>optional</td>
@@ -44838,14 +44097,14 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The type of Xen domain to create (dom0 or domU)</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">the virtual guestOS identification string for the VM</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id160" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id151" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">memory</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -44856,7 +44115,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The memory setup for the Xen guest.</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The memory setup for the guest VM.</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -44869,24 +44128,46 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id159" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id159');"
+                           <div class="floatRight"><input id="button_source_id147" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id147');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id159" style="display:block">
+                           <div id="source_id147" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.xenconfig.attlist"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.machine.attlist"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"arch"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the VM architecture type</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
+        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ix86"</span><span class="tokenElement">/></span><span class="tokenIndent">
+        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"x86_64"</span><span class="tokenElement">/></span><span class="tokenIndent">
+        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"%arch"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"HWversion"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The virtual HW version number for the VM configuration</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"guestOS"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the virtual guestOS identification string for the VM</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"memory"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The memory setup for the Xen guest.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The memory setup for the guest VM.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"domain"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The type of Xen domain to create (dom0 or domU)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The domain setup for the VM (xen only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
@@ -44911,7 +44192,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id162"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.attlist</span></div>
+      </table><a id="id153"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -44930,51 +44211,52 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id162" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id162');"
+                           <div class="floatRight"><input id="button_diagram_id153" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id153');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id162" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html196.jpeg"
-                                   usemap="#kiwi_46_html196" /><map name="kiwi_46_html196" id="kiwi_46_html196">
-                                 <area alt="kiwi0.tmp#id164" href="kiwi0.html#id164" coords="162,44,352,86" />
-                                 <area alt="kiwi0.tmp#id163" href="kiwi0.html#id163" coords="151,3,322,29" />
-                                 <area alt="kiwi0.tmp#id165" href="kiwi0.html#id165" coords="148,103,272,145" />
-                                 <area alt="kiwi0.tmp#id166" href="kiwi0.html#id166" coords="148,155,272,197" />
-                                 <area alt="kiwi0.tmp#id167" href="kiwi0.html#id167" coords="148,207,272,249" />
-                                 <area alt="kiwi0.tmp#id168" href="kiwi0.html#id168" coords="148,259,245,283" />
-                                 <area alt="kiwi0.tmp#id169" href="kiwi0.html#id169" coords="148,293,243,317" />
-                                 <area alt="kiwi0.tmp#id170" href="kiwi0.html#id170" coords="148,327,210,351" />
-                                 <area alt="kiwi0.tmp#id171" href="kiwi0.html#id171" coords="148,361,211,385" />
-                                 <area alt="kiwi0.tmp#id172" href="kiwi0.html#id172" coords="148,395,338,437" />
-                                 <area alt="kiwi0.tmp#id173" href="kiwi0.html#id173" coords="148,447,272,489" />
-                                 <area alt="kiwi0.tmp#id174" href="kiwi0.html#id174" coords="148,499,285,541" />
-                                 <area alt="kiwi0.tmp#id175" href="kiwi0.html#id175" coords="148,551,338,593" />
-                                 <area alt="kiwi0.tmp#id176" href="kiwi0.html#id176" coords="148,603,272,645" />
-                                 <area alt="kiwi0.tmp#id177" href="kiwi0.html#id177" coords="148,655,209,679" />
-                                 <area alt="kiwi0.tmp#id178" href="kiwi0.html#id178" coords="148,689,209,713" />
-                                 <area alt="kiwi0.tmp#id179" href="kiwi0.html#id179" coords="148,723,338,765" />
-                                 <area alt="kiwi0.tmp#id180" href="kiwi0.html#id180" coords="148,775,338,817" />
-                                 <area alt="kiwi0.tmp#id181" href="kiwi0.html#id181" coords="148,827,338,869" />
-                                 <area alt="kiwi0.tmp#id182" href="kiwi0.html#id182" coords="148,879,233,903" />
-                                 <area alt="kiwi0.tmp#id183" href="kiwi0.html#id183" coords="148,913,338,955" />
-                                 <area alt="kiwi0.tmp#id184" href="kiwi0.html#id184" coords="148,965,272,1007" />
-                                 <area alt="kiwi0.tmp#id185" href="kiwi0.html#id185" coords="148,1017,260,1041" /></map></div>
+                           <div id="diagram_id153" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html52.jpeg" usemap="#kiwi_46_html52" /><map name="kiwi_46_html52" id="kiwi_46_html52">
+                                 <area alt="kiwi0.tmp#id155" href="kiwi0.html#id155" coords="162,44,352,86" />
+                                 <area alt="kiwi0.tmp#id154" href="kiwi0.html#id154" coords="151,3,322,29" />
+                                 <area alt="kiwi0.tmp#id156" href="kiwi0.html#id156" coords="148,103,272,145" />
+                                 <area alt="kiwi0.tmp#id157" href="kiwi0.html#id157" coords="148,155,272,197" />
+                                 <area alt="kiwi0.tmp#id158" href="kiwi0.html#id158" coords="148,207,272,249" />
+                                 <area alt="kiwi0.tmp#id159" href="kiwi0.html#id159" coords="148,259,245,283" />
+                                 <area alt="kiwi0.tmp#id160" href="kiwi0.html#id160" coords="148,293,243,317" />
+                                 <area alt="kiwi0.tmp#id161" href="kiwi0.html#id161" coords="148,327,210,351" />
+                                 <area alt="kiwi0.tmp#id162" href="kiwi0.html#id162" coords="148,361,211,385" />
+                                 <area alt="kiwi0.tmp#id163" href="kiwi0.html#id163" coords="148,395,338,437" />
+                                 <area alt="kiwi0.tmp#id164" href="kiwi0.html#id164" coords="148,447,272,489" />
+                                 <area alt="kiwi0.tmp#id165" href="kiwi0.html#id165" coords="148,499,285,541" />
+                                 <area alt="kiwi0.tmp#id166" href="kiwi0.html#id166" coords="148,551,338,593" />
+                                 <area alt="kiwi0.tmp#id167" href="kiwi0.html#id167" coords="148,603,272,645" />
+                                 <area alt="kiwi0.tmp#id168" href="kiwi0.html#id168" coords="148,655,209,679" />
+                                 <area alt="kiwi0.tmp#id169" href="kiwi0.html#id169" coords="148,689,209,713" />
+                                 <area alt="kiwi0.tmp#id170" href="kiwi0.html#id170" coords="148,723,338,765" />
+                                 <area alt="kiwi0.tmp#id171" href="kiwi0.html#id171" coords="148,775,338,817" />
+                                 <area alt="kiwi0.tmp#id172" href="kiwi0.html#id172" coords="148,827,338,869" />
+                                 <area alt="kiwi0.tmp#id173" href="kiwi0.html#id173" coords="148,879,233,903" />
+                                 <area alt="kiwi0.tmp#id174" href="kiwi0.html#id174" coords="148,913,338,955" />
+                                 <area alt="kiwi0.tmp#id175" href="kiwi0.html#id175" coords="148,965,272,1007" />
+                                 <area alt="kiwi0.tmp#id176" href="kiwi0.html#id176" coords="148,1017,272,1059" />
+                                 <area alt="kiwi0.tmp#id177" href="kiwi0.html#id177" coords="148,1069,272,1111" />
+                                 <area alt="kiwi0.tmp#id178" href="kiwi0.html#id178" coords="148,1121,260,1145" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id162" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id162');"
+                           <div class="floatRight"><input id="button_usedBy_id153" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id153');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id162" style="display:block">
+                           <div id="usedBy_id153" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                  </tr>
                               </table>
@@ -44984,13 +44266,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id162" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id153" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id162');"
+                                     onclick="switchState('attributes_id153');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id162" style="display:block">
+                           <div id="attributes_id153" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -45003,7 +44285,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id182" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id173" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">baseroot</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -45021,7 +44303,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id170" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id161" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">boot</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -45032,7 +44314,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id169" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id160" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootkernel</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -45043,7 +44325,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id175" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id166" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootloader</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -45054,7 +44336,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id168" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id159" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootprofile</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -45065,7 +44347,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id167" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id158" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">checkprebuilt</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -45076,7 +44358,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id176" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id167" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">compressed</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -45087,7 +44369,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id179" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id170" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">filesystem</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -45098,7 +44380,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id172" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id163" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">flags</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -45109,18 +44391,25 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id183" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id174" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">format</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
                                     <td></td>
                                     <td>optional</td>
                                     <td>
-                                       <div class="annotation"></div>
+                                       <div class="annotation">
+                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                                 class="preWrapContainer">
+                                             <tr>
+                                                <td width="100%"><pre><span class="tokenText">Specifies the format of the virtual disk.</span></pre></td>
+                                             </tr>
+                                          </table>
+                                       </div>
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id165" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id156" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">fsnocheck</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -45138,7 +44427,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id180" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id171" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">fsreadonly</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -45156,7 +44445,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id181" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id172" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">fsreadwrite</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -45174,7 +44463,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id173" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id164" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">hybrid</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -45185,7 +44474,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id174" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id165" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">hybridpersistent</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -45196,7 +44485,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id164" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id155" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -45214,7 +44503,43 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id185" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id175" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">installiso</a></b></td>
+                                    <td><b>xs:boolean</b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>optional</td>
+                                    <td>
+                                       <div class="annotation">
+                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                                 class="preWrapContainer">
+                                             <tr>
+                                                <td width="100%"><pre><span class="tokenText">Specifies if a install iso should be created (oem only)</span></pre></td>
+                                             </tr>
+                                          </table>
+                                       </div>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id176" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">installstick</a></b></td>
+                                    <td><b>xs:boolean</b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>optional</td>
+                                    <td>
+                                       <div class="annotation">
+                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                                 class="preWrapContainer">
+                                             <tr>
+                                                <td width="100%"><pre><span class="tokenText">Specifies if a install stick should be created (oem only)</span></pre></td>
+                                             </tr>
+                                          </table>
+                                       </div>
+                                    </td>
+                                 </tr>
+                                 <tr>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id178" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">kernelcmdline</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -45225,7 +44550,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id178" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id169" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">luks</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -45236,7 +44561,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id166" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id157" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvm</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -45247,7 +44572,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id184" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id177" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">primary</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -45265,7 +44590,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id177" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id168" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vga</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -45276,7 +44601,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id171" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volid</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -45293,12 +44618,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id162" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id162');"
+                           <div class="floatRight"><input id="button_source_id153" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id153');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id162" style="display:block">
+                           <div id="source_id153" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -45332,6 +44657,7 @@
         </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"extlinux"</span><span class="tokenElement">/></span><span class="tokenIndent">
         </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"grub"</span><span class="tokenElement">/></span><span class="tokenIndent">
         </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"syslinux"</span><span class="tokenElement">/></span><span class="tokenIndent">
+        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"zipl"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
@@ -45383,23 +44709,27 @@
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"format"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Specifies the format of the virtual disk.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"bochs"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"cloop"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"cow"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"dmg"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"iso"</span><span class="tokenElement">/></span><span class="tokenIndent">
         </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ovf"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"qcow"</span><span class="tokenElement">/></span><span class="tokenIndent">
         </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"qcow2"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"usb"</span><span class="tokenElement">/></span><span class="tokenIndent">
         </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vmdk"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vpc"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vvfat"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"installiso"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Specifies if a install iso should be created (oem only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"installstick"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Specifies if a install stick should be created (oem only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"primary"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Specifies the primary type (choose KIWI option type)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
@@ -45422,7 +44752,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id163"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.image.attribute</span></div>
+      </table><a id="id154"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.image.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -45441,28 +44771,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id163" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id163');"
+                           <div class="floatRight"><input id="button_diagram_id154" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id154');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id163" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html26.jpeg" usemap="#kiwi_46_html26" /><map name="kiwi_46_html26" id="kiwi_46_html26">
-                                 <area alt="kiwi0.tmp#id164" href="kiwi0.html#id164" coords="199,0,389,42" /></map></div>
+                           <div id="diagram_id154" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html214.jpeg"
+                                   usemap="#kiwi_46_html214" /><map name="kiwi_46_html214" id="kiwi_46_html214">
+                                 <area alt="kiwi0.tmp#id155" href="kiwi0.html#id155" coords="199,0,389,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id163" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id163');"
+                           <div class="floatRight"><input id="button_usedBy_id154" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id154');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id163" style="display:block">
+                           <div id="usedBy_id154" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -45472,13 +44803,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id163" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id154" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id163');"
+                                     onclick="switchState('attributes_id154');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id163" style="display:block">
+                           <div id="attributes_id154" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -45491,7 +44822,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id164" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id155" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -45515,12 +44846,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id163" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id163');"
+                           <div class="floatRight"><input id="button_source_id154" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id154');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id163" style="display:block">
+                           <div id="source_id154" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -45566,7 +44897,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id202"></a><div class="componentTitle">Attribute Group <span class="qname">k.preferences.attlist</span></div>
+      </table><a id="id195"></a><div class="componentTitle">Attribute Group <span class="qname">k.preferences.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -45585,28 +44916,28 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id202" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id202');"
+                           <div class="floatRight"><input id="button_diagram_id195" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id195');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id202" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html19.jpeg" usemap="#kiwi_46_html19" /><map name="kiwi_46_html19" id="kiwi_46_html19">
-                                 <area alt="kiwi0.tmp#id203" href="kiwi0.html#id203" coords="189,1,267,25" /></map></div>
+                           <div id="diagram_id195" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html31.jpeg" usemap="#kiwi_46_html31" /><map name="kiwi_46_html31" id="kiwi_46_html31">
+                                 <area alt="kiwi0.tmp#id196" href="kiwi0.html#id196" coords="189,1,267,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id202" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id202');"
+                           <div class="floatRight"><input id="button_usedBy_id195" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id195');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id202" style="display:block">
+                           <div id="usedBy_id195" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></td>
                                  </tr>
                               </table>
@@ -45616,13 +44947,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id202" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id195" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id202');"
+                                     onclick="switchState('attributes_id195');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id202" style="display:block">
+                           <div id="attributes_id195" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -45635,7 +44966,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id203" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id196" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -45659,12 +44990,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id202" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id202');"
+                           <div class="floatRight"><input id="button_source_id195" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id195');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id202" style="display:block">
+                           <div id="source_id195" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -45690,7 +45021,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id206"></a><div class="componentTitle">Attribute Group <span class="qname">k.profile.attlist</span></div>
+      </table><a id="id199"></a><div class="componentTitle">Attribute Group <span class="qname">k.profile.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -45709,32 +45040,32 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id206" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id206');"
+                           <div class="floatRight"><input id="button_diagram_id199" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id199');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id206" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html84.jpeg" usemap="#kiwi_46_html84" /><map name="kiwi_46_html84" id="kiwi_46_html84">
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="177,47,319,73" />
-                                 <area alt="kiwi0.tmp#id207" href="kiwi0.html#id207" coords="163,3,343,29" />
-                                 <area alt="kiwi0.tmp#id209" href="kiwi0.html#id209" coords="174,139,272,163" />
-                                 <area alt="kiwi0.tmp#id208" href="kiwi0.html#id208" coords="163,98,375,124" />
-                                 <area alt="kiwi0.tmp#id210" href="kiwi0.html#id210" coords="160,180,284,222" /></map></div>
+                           <div id="diagram_id199" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html5.jpeg" usemap="#kiwi_46_html5" /><map name="kiwi_46_html5" id="kiwi_46_html5">
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="177,47,319,73" />
+                                 <area alt="kiwi0.tmp#id200" href="kiwi0.html#id200" coords="163,3,343,29" />
+                                 <area alt="kiwi0.tmp#id202" href="kiwi0.html#id202" coords="174,139,272,163" />
+                                 <area alt="kiwi0.tmp#id201" href="kiwi0.html#id201" coords="163,98,375,124" />
+                                 <area alt="kiwi0.tmp#id203" href="kiwi0.html#id203" coords="160,180,284,222" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id206" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id206');"
+                           <div class="floatRight"><input id="button_usedBy_id199" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id199');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id206" style="display:block">
+                           <div id="usedBy_id199" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id205" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id198" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profile</a></b></td>
                                  </tr>
                               </table>
@@ -45744,13 +45075,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id206" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id199" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id206');"
+                                     onclick="switchState('attributes_id199');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id206" style="display:block">
+                           <div id="attributes_id199" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -45763,7 +45094,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id209" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id202" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -45781,7 +45112,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id210" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id203" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">import</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -45792,7 +45123,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -45816,12 +45147,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id206" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id206');"
+                           <div class="floatRight"><input id="button_source_id199" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id199');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id206" style="display:block">
+                           <div id="source_id199" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -45845,7 +45176,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id207"></a><div class="componentTitle">Attribute Group <span class="qname">k.profile.name.attribute</span></div>
+      </table><a id="id200"></a><div class="componentTitle">Attribute Group <span class="qname">k.profile.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -45864,30 +45195,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id207" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id207');"
+                           <div class="floatRight"><input id="button_diagram_id200" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id200');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id207" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html164.jpeg"
-                                   usemap="#kiwi_46_html164" /><map name="kiwi_46_html164" id="kiwi_46_html164">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="222,44,288,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="211,3,353,29" /></map></div>
+                           <div id="diagram_id200" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html142.jpeg"
+                                   usemap="#kiwi_46_html142" /><map name="kiwi_46_html142" id="kiwi_46_html142">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="222,44,288,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="211,3,353,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id207" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id207');"
+                           <div class="floatRight"><input id="button_usedBy_id200" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id200');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id207" style="display:block">
+                           <div id="usedBy_id200" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id206" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id199" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -45897,13 +45228,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id207" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id200" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id207');"
+                                     onclick="switchState('attributes_id200');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id207" style="display:block">
+                           <div id="attributes_id200" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -45916,7 +45247,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -45940,12 +45271,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id207" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id207');"
+                           <div class="floatRight"><input id="button_source_id200" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id200');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id207" style="display:block">
+                           <div id="source_id200" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -45967,7 +45298,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id208"></a><div class="componentTitle">Attribute Group <span class="qname">k.profile.description.attribute</span></div>
+      </table><a id="id201"></a><div class="componentTitle">Attribute Group <span class="qname">k.profile.description.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -45986,28 +45317,28 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id208" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id208');"
+                           <div class="floatRight"><input id="button_diagram_id201" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id201');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id208" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html75.jpeg" usemap="#kiwi_46_html75" /><map name="kiwi_46_html75" id="kiwi_46_html75">
-                                 <area alt="kiwi0.tmp#id209" href="kiwi0.html#id209" coords="240,1,338,25" /></map></div>
+                           <div id="diagram_id201" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html94.jpeg" usemap="#kiwi_46_html94" /><map name="kiwi_46_html94" id="kiwi_46_html94">
+                                 <area alt="kiwi0.tmp#id202" href="kiwi0.html#id202" coords="240,1,338,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id208" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id208');"
+                           <div class="floatRight"><input id="button_usedBy_id201" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id201');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id208" style="display:block">
+                           <div id="usedBy_id201" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id206" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id199" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -46017,13 +45348,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id208" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id201" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id208');"
+                                     onclick="switchState('attributes_id201');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id208" style="display:block">
+                           <div id="attributes_id201" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -46036,7 +45367,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id209" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id202" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -46060,12 +45391,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id208" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id208');"
+                           <div class="floatRight"><input id="button_source_id201" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id201');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id208" style="display:block">
+                           <div id="source_id201" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -46091,7 +45422,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id214"></a><div class="componentTitle">Attribute Group <span class="qname">k.arch.attlist</span></div>
+      </table><a id="id207"></a><div class="componentTitle">Attribute Group <span class="qname">k.arch.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -46110,32 +45441,33 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id214" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id214');"
+                           <div class="floatRight"><input id="button_diagram_id207" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id207');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id214" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html88.jpeg" usemap="#kiwi_46_html88" /><map name="kiwi_46_html88" id="kiwi_46_html88">
-                                 <area alt="kiwi0.tmp#id216" href="kiwi0.html#id216" coords="166,47,289,73" />
-                                 <area alt="kiwi0.tmp#id215" href="kiwi0.html#id215" coords="152,3,302,29" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="166,142,308,168" />
-                                 <area alt="kiwi0.tmp#id218" href="kiwi0.html#id218" coords="152,98,321,124" />
-                                 <area alt="kiwi0.tmp#id219" href="kiwi0.html#id219" coords="149,190,260,232" /></map></div>
+                           <div id="diagram_id207" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html258.jpeg"
+                                   usemap="#kiwi_46_html258" /><map name="kiwi_46_html258" id="kiwi_46_html258">
+                                 <area alt="kiwi0.tmp#id209" href="kiwi0.html#id209" coords="166,47,289,73" />
+                                 <area alt="kiwi0.tmp#id208" href="kiwi0.html#id208" coords="152,3,302,29" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="166,142,308,168" />
+                                 <area alt="kiwi0.tmp#id211" href="kiwi0.html#id211" coords="152,98,321,124" />
+                                 <area alt="kiwi0.tmp#id212" href="kiwi0.html#id212" coords="149,190,260,232" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id214" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id214');"
+                           <div class="floatRight"><input id="button_usedBy_id207" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id207');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id214" style="display:block">
+                           <div id="usedBy_id207" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id213" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id206" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                  </tr>
                               </table>
@@ -46145,13 +45477,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id214" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id207" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id214');"
+                                     onclick="switchState('attributes_id207');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id214" style="display:block">
+                           <div id="attributes_id207" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -46164,7 +45496,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id219" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id212" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">fallback</a></b></td>
                                     <td><b>xs:IDREF</b></td>
                                     <td></td>
@@ -46175,7 +45507,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id217" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id210" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td><b>xs:ID</b></td>
                                     <td></td>
@@ -46193,7 +45525,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -46217,12 +45549,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id214" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id214');"
+                           <div class="floatRight"><input id="button_source_id207" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id207');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id214" style="display:block">
+                           <div id="source_id207" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -46246,7 +45578,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id215"></a><div class="componentTitle">Attribute Group <span class="qname">k.arch.id.attribute</span></div>
+      </table><a id="id208"></a><div class="componentTitle">Attribute Group <span class="qname">k.arch.id.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -46265,30 +45597,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id215" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id215');"
+                           <div class="floatRight"><input id="button_diagram_id208" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id208');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id215" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html189.jpeg"
-                                   usemap="#kiwi_46_html189" /><map name="kiwi_46_html189" id="kiwi_46_html189">
-                                 <area alt="kiwi0.tmp#id217" href="kiwi0.html#id217" coords="192,44,284,86" />
-                                 <area alt="kiwi0.tmp#id216" href="kiwi0.html#id216" coords="181,3,304,29" /></map></div>
+                           <div id="diagram_id208" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html217.jpeg"
+                                   usemap="#kiwi_46_html217" /><map name="kiwi_46_html217" id="kiwi_46_html217">
+                                 <area alt="kiwi0.tmp#id210" href="kiwi0.html#id210" coords="192,44,284,86" />
+                                 <area alt="kiwi0.tmp#id209" href="kiwi0.html#id209" coords="181,3,304,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id215" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id215');"
+                           <div class="floatRight"><input id="button_usedBy_id208" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id208');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id215" style="display:block">
+                           <div id="usedBy_id208" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id214" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id207" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -46298,13 +45630,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id215" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id208" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id215');"
+                                     onclick="switchState('attributes_id208');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id215" style="display:block">
+                           <div id="attributes_id208" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -46317,7 +45649,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id217" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id210" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td><b>xs:ID</b></td>
                                     <td></td>
@@ -46341,12 +45673,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id215" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id215');"
+                           <div class="floatRight"><input id="button_source_id208" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id208');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id215" style="display:block">
+                           <div id="source_id208" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -46368,7 +45700,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id216"></a><div class="componentTitle">Attribute Group <span class="qname">k.id.attribute</span></div>
+      </table><a id="id209"></a><div class="componentTitle">Attribute Group <span class="qname">k.id.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -46387,29 +45719,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id216" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id216');"
+                           <div class="floatRight"><input id="button_diagram_id209" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id209');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id216" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html183.jpeg"
-                                   usemap="#kiwi_46_html183" /><map name="kiwi_46_html183" id="kiwi_46_html183">
-                                 <area alt="kiwi0.tmp#id217" href="kiwi0.html#id217" coords="151,0,243,42" /></map></div>
+                           <div id="diagram_id209" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html243.jpeg"
+                                   usemap="#kiwi_46_html243" /><map name="kiwi_46_html243" id="kiwi_46_html243">
+                                 <area alt="kiwi0.tmp#id210" href="kiwi0.html#id210" coords="151,0,243,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id216" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id216');"
+                           <div class="floatRight"><input id="button_usedBy_id209" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id209');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id216" style="display:block">
+                           <div id="usedBy_id209" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id215" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id208" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.id.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -46419,13 +45751,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id216" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id209" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id216');"
+                                     onclick="switchState('attributes_id209');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id216" style="display:block">
+                           <div id="attributes_id209" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -46438,7 +45770,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id217" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id210" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td><b>xs:ID</b></td>
                                     <td></td>
@@ -46462,12 +45794,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id216" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id216');"
+                           <div class="floatRight"><input id="button_source_id209" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id209');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id216" style="display:block">
+                           <div id="source_id209" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -46493,7 +45825,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id218"></a><div class="componentTitle">Attribute Group <span class="qname">k.arch.name.attribute</span></div>
+      </table><a id="id211"></a><div class="componentTitle">Attribute Group <span class="qname">k.arch.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -46512,29 +45844,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id218" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id218');"
+                           <div class="floatRight"><input id="button_diagram_id211" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id211');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id218" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html89.jpeg" usemap="#kiwi_46_html89" /><map name="kiwi_46_html89" id="kiwi_46_html89">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="211,44,277,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="200,3,342,29" /></map></div>
+                           <div id="diagram_id211" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html61.jpeg" usemap="#kiwi_46_html61" /><map name="kiwi_46_html61" id="kiwi_46_html61">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="211,44,277,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="200,3,342,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id218" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id218');"
+                           <div class="floatRight"><input id="button_usedBy_id211" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id211');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id218" style="display:block">
+                           <div id="usedBy_id211" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id214" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id207" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -46544,13 +45876,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id218" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id211" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id218');"
+                                     onclick="switchState('attributes_id211');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id218" style="display:block">
+                           <div id="attributes_id211" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -46563,7 +45895,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -46587,12 +45919,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id218" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id218');"
+                           <div class="floatRight"><input id="button_source_id211" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id211');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id218" style="display:block">
+                           <div id="source_id211" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -46614,7 +45946,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id221"></a><div class="componentTitle">Attribute Group <span class="qname">k.requiredarch.attlist</span></div>
+      </table><a id="id214"></a><div class="componentTitle">Attribute Group <span class="qname">k.requiredarch.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -46633,29 +45965,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id221" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id221');"
+                           <div class="floatRight"><input id="button_diagram_id214" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id214');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id221" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html71.jpeg" usemap="#kiwi_46_html71" /><map name="kiwi_46_html71" id="kiwi_46_html71">
-                                 <area alt="kiwi0.tmp#id223" href="kiwi0.html#id223" coords="209,44,320,86" />
-                                 <area alt="kiwi0.tmp#id222" href="kiwi0.html#id222" coords="198,3,399,29" /></map></div>
+                           <div id="diagram_id214" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html33.jpeg" usemap="#kiwi_46_html33" /><map name="kiwi_46_html33" id="kiwi_46_html33">
+                                 <area alt="kiwi0.tmp#id216" href="kiwi0.html#id216" coords="209,44,320,86" />
+                                 <area alt="kiwi0.tmp#id215" href="kiwi0.html#id215" coords="198,3,399,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id221" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id221');"
+                           <div class="floatRight"><input id="button_usedBy_id214" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id214');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id221" style="display:block">
+                           <div id="usedBy_id214" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id220" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id213" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">requiredarch</a></b></td>
                                  </tr>
                               </table>
@@ -46665,13 +45997,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id221" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id214" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id221');"
+                                     onclick="switchState('attributes_id214');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id221" style="display:block">
+                           <div id="attributes_id214" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -46684,7 +46016,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id223" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id216" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ref</a></b></td>
                                     <td><b>xs:IDREF</b></td>
                                     <td></td>
@@ -46701,12 +46033,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id221" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id221');"
+                           <div class="floatRight"><input id="button_source_id214" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id214');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id221" style="display:block">
+                           <div id="source_id214" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -46728,7 +46060,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id222"></a><div class="componentTitle">Attribute Group <span class="qname">k.requiredarch.ref.attribute</span></div>
+      </table><a id="id215"></a><div class="componentTitle">Attribute Group <span class="qname">k.requiredarch.ref.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -46747,28 +46079,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id222" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id222');"
+                           <div class="floatRight"><input id="button_diagram_id215" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id215');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id222" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html5.jpeg" usemap="#kiwi_46_html5" /><map name="kiwi_46_html5" id="kiwi_46_html5">
-                                 <area alt="kiwi0.tmp#id223" href="kiwi0.html#id223" coords="229,0,340,42" /></map></div>
+                           <div id="diagram_id215" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html204.jpeg"
+                                   usemap="#kiwi_46_html204" /><map name="kiwi_46_html204" id="kiwi_46_html204">
+                                 <area alt="kiwi0.tmp#id216" href="kiwi0.html#id216" coords="229,0,340,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id222" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id222');"
+                           <div class="floatRight"><input id="button_usedBy_id215" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id215');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id222" style="display:block">
+                           <div id="usedBy_id215" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id221" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id214" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.requiredarch.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -46778,13 +46111,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id222" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id215" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id222');"
+                                     onclick="switchState('attributes_id215');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id222" style="display:block">
+                           <div id="attributes_id215" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -46797,7 +46130,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id223" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id216" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ref</a></b></td>
                                     <td><b>xs:IDREF</b></td>
                                     <td></td>
@@ -46814,12 +46147,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id222" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id222');"
+                           <div class="floatRight"><input id="button_source_id215" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id215');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id222" style="display:block">
+                           <div id="source_id215" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -46841,7 +46174,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id226"></a><div class="componentTitle">Attribute Group <span class="qname">k.productoption.attlist</span></div>
+      </table><a id="id219"></a><div class="componentTitle">Attribute Group <span class="qname">k.productoption.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -46860,29 +46193,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id226" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id226');"
+                           <div class="floatRight"><input id="button_diagram_id219" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id219');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id226" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html47.jpeg" usemap="#kiwi_46_html47" /><map name="kiwi_46_html47" id="kiwi_46_html47">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="217,44,283,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="206,3,348,29" /></map></div>
+                           <div id="diagram_id219" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html131.jpeg"
+                                   usemap="#kiwi_46_html131" /><map name="kiwi_46_html131" id="kiwi_46_html131">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="217,44,283,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="206,3,348,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id226" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id226');"
+                           <div class="floatRight"><input id="button_usedBy_id219" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id219');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id226" style="display:block">
+                           <div id="usedBy_id219" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id218" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoption</a></b></td>
                                  </tr>
                               </table>
@@ -46892,13 +46226,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id226" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id219" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id226');"
+                                     onclick="switchState('attributes_id219');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id226" style="display:block">
+                           <div id="attributes_id219" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -46911,7 +46245,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -46935,12 +46269,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id226" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id226');"
+                           <div class="floatRight"><input id="button_source_id219" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id219');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id226" style="display:block">
+                           <div id="source_id219" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -46962,7 +46296,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id228"></a><div class="componentTitle">Attribute Group <span class="qname">k.productinfo.attlist</span></div>
+      </table><a id="id221"></a><div class="componentTitle">Attribute Group <span class="qname">k.productinfo.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -46981,30 +46315,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id228" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id228');"
+                           <div class="floatRight"><input id="button_diagram_id221" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id221');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id228" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html252.jpeg"
-                                   usemap="#kiwi_46_html252" /><map name="kiwi_46_html252" id="kiwi_46_html252">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="203,44,269,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="192,3,334,29" /></map></div>
+                           <div id="diagram_id221" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html90.jpeg" usemap="#kiwi_46_html90" /><map name="kiwi_46_html90" id="kiwi_46_html90">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="203,44,269,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="192,3,334,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id228" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id228');"
+                           <div class="floatRight"><input id="button_usedBy_id221" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id221');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id228" style="display:block">
+                           <div id="usedBy_id221" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id227" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id220" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productinfo</a></b></td>
                                  </tr>
                               </table>
@@ -47014,13 +46347,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id228" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id221" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id228');"
+                                     onclick="switchState('attributes_id221');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id228" style="display:block">
+                           <div id="attributes_id221" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -47033,7 +46366,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -47057,12 +46390,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id228" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id228');"
+                           <div class="floatRight"><input id="button_source_id221" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id221');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id228" style="display:block">
+                           <div id="source_id221" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -47084,7 +46417,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id230"></a><div class="componentTitle">Attribute Group <span class="qname">k.productvar.attlist</span></div>
+      </table><a id="id223"></a><div class="componentTitle">Attribute Group <span class="qname">k.productvar.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -47103,30 +46436,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id230" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id230');"
+                           <div class="floatRight"><input id="button_diagram_id223" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id223');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id230" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html286.jpeg"
-                                   usemap="#kiwi_46_html286" /><map name="kiwi_46_html286" id="kiwi_46_html286">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="199,44,265,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="188,3,330,29" /></map></div>
+                           <div id="diagram_id223" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html231.jpeg"
+                                   usemap="#kiwi_46_html231" /><map name="kiwi_46_html231" id="kiwi_46_html231">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="199,44,265,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="188,3,330,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id230" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id230');"
+                           <div class="floatRight"><input id="button_usedBy_id223" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id223');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id230" style="display:block">
+                           <div id="usedBy_id223" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id229" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id222" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productvar</a></b></td>
                                  </tr>
                               </table>
@@ -47136,13 +46469,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id230" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id223" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id230');"
+                                     onclick="switchState('attributes_id223');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id230" style="display:block">
+                           <div id="attributes_id223" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -47155,7 +46488,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -47179,12 +46512,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id230" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id230');"
+                           <div class="floatRight"><input id="button_source_id223" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id223');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id230" style="display:block">
+                           <div id="source_id223" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -47206,7 +46539,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id234"></a><div class="componentTitle">Attribute Group <span class="qname">k.source.attlist</span></div>
+      </table><a id="id227"></a><div class="componentTitle">Attribute Group <span class="qname">k.source.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -47225,30 +46558,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id234" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id234');"
+                           <div class="floatRight"><input id="button_diagram_id227" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id227');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id234" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html250.jpeg"
-                                   usemap="#kiwi_46_html250" /><map name="kiwi_46_html250" id="kiwi_46_html250">
-                                 <area alt="kiwi0.tmp#id236" href="kiwi0.html#id236" coords="179,47,316,73" />
-                                 <area alt="kiwi0.tmp#id235" href="kiwi0.html#id235" coords="165,3,342,29" /></map></div>
+                           <div id="diagram_id227" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html160.jpeg"
+                                   usemap="#kiwi_46_html160" /><map name="kiwi_46_html160" id="kiwi_46_html160">
+                                 <area alt="kiwi0.tmp#id229" href="kiwi0.html#id229" coords="179,47,316,73" />
+                                 <area alt="kiwi0.tmp#id228" href="kiwi0.html#id228" coords="165,3,342,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id234" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id234');"
+                           <div class="floatRight"><input id="button_usedBy_id227" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id227');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id234" style="display:block">
+                           <div id="usedBy_id227" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id233" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                                  </tr>
                               </table>
@@ -47258,13 +46591,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id234" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id227" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id234');"
+                                     onclick="switchState('attributes_id227');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id234" style="display:block">
+                           <div id="attributes_id227" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -47277,7 +46610,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id237" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id230" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">path</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -47301,12 +46634,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id234" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id234');"
+                           <div class="floatRight"><input id="button_source_id227" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id227');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id234" style="display:block">
+                           <div id="source_id227" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -47328,7 +46661,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id235"></a><div class="componentTitle">Attribute Group <span class="qname">k.source.path.attribute</span></div>
+      </table><a id="id228"></a><div class="componentTitle">Attribute Group <span class="qname">k.source.path.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -47347,30 +46680,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id235" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id235');"
+                           <div class="floatRight"><input id="button_diagram_id228" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id228');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id235" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html290.jpeg"
-                                   usemap="#kiwi_46_html290" /><map name="kiwi_46_html290" id="kiwi_46_html290">
-                                 <area alt="kiwi0.tmp#id237" href="kiwi0.html#id237" coords="219,44,280,68" />
-                                 <area alt="kiwi0.tmp#id236" href="kiwi0.html#id236" coords="208,3,345,29" /></map></div>
+                           <div id="diagram_id228" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html222.jpeg"
+                                   usemap="#kiwi_46_html222" /><map name="kiwi_46_html222" id="kiwi_46_html222">
+                                 <area alt="kiwi0.tmp#id230" href="kiwi0.html#id230" coords="219,44,280,68" />
+                                 <area alt="kiwi0.tmp#id229" href="kiwi0.html#id229" coords="208,3,345,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id235" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id235');"
+                           <div class="floatRight"><input id="button_usedBy_id228" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id228');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id235" style="display:block">
+                           <div id="usedBy_id228" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id234" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id227" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -47380,13 +46713,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id235" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id228" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id235');"
+                                     onclick="switchState('attributes_id228');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id235" style="display:block">
+                           <div id="attributes_id228" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -47399,7 +46732,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id237" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id230" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">path</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -47423,12 +46756,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id235" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id235');"
+                           <div class="floatRight"><input id="button_source_id228" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id228');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id235" style="display:block">
+                           <div id="source_id228" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -47450,7 +46783,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id236"></a><div class="componentTitle">Attribute Group <span class="qname">k.path.attribute</span></div>
+      </table><a id="id229"></a><div class="componentTitle">Attribute Group <span class="qname">k.path.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -47469,29 +46802,28 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id236" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id236');"
+                           <div class="floatRight"><input id="button_diagram_id229" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id229');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id236" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html209.jpeg"
-                                   usemap="#kiwi_46_html209" /><map name="kiwi_46_html209" id="kiwi_46_html209">
-                                 <area alt="kiwi0.tmp#id237" href="kiwi0.html#id237" coords="165,1,226,25" /></map></div>
+                           <div id="diagram_id229" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html15.jpeg" usemap="#kiwi_46_html15" /><map name="kiwi_46_html15" id="kiwi_46_html15">
+                                 <area alt="kiwi0.tmp#id230" href="kiwi0.html#id230" coords="165,1,226,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id236" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id236');"
+                           <div class="floatRight"><input id="button_usedBy_id229" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id229');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id236" style="display:block">
+                           <div id="usedBy_id229" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id235" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id228" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source.path.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -47501,13 +46833,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id236" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id229" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id236');"
+                                     onclick="switchState('attributes_id229');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id236" style="display:block">
+                           <div id="attributes_id229" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -47520,7 +46852,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id237" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id230" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">path</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -47544,12 +46876,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id236" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id236');"
+                           <div class="floatRight"><input id="button_source_id229" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id229');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id236" style="display:block">
+                           <div id="source_id229" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -47575,7 +46907,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id238"></a><div class="componentTitle">Attribute Group <span class="qname">k.instrepo.attlist</span></div>
+      </table><a id="id231"></a><div class="componentTitle">Attribute Group <span class="qname">k.instrepo.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -47594,34 +46926,35 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id238" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id238');"
+                           <div class="floatRight"><input id="button_diagram_id231" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id231');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id238" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html60.jpeg" usemap="#kiwi_46_html60" /><map name="kiwi_46_html60" id="kiwi_46_html60">
-                                 <area alt="kiwi0.tmp#id240" href="kiwi0.html#id240" coords="184,44,276,86" />
-                                 <area alt="kiwi0.tmp#id239" href="kiwi0.html#id239" coords="173,3,363,29" />
-                                 <area alt="kiwi0.tmp#id242" href="kiwi0.html#id242" coords="184,147,261,171" />
-                                 <area alt="kiwi0.tmp#id241" href="kiwi0.html#id241" coords="173,106,374,132" />
-                                 <area alt="kiwi0.tmp#id243" href="kiwi0.html#id243" coords="170,188,260,212" />
-                                 <area alt="kiwi0.tmp#id244" href="kiwi0.html#id244" coords="170,222,231,246" />
-                                 <area alt="kiwi0.tmp#id245" href="kiwi0.html#id245" coords="170,256,294,298" /></map></div>
+                           <div id="diagram_id231" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html277.jpeg"
+                                   usemap="#kiwi_46_html277" /><map name="kiwi_46_html277" id="kiwi_46_html277">
+                                 <area alt="kiwi0.tmp#id233" href="kiwi0.html#id233" coords="184,44,276,86" />
+                                 <area alt="kiwi0.tmp#id232" href="kiwi0.html#id232" coords="173,3,363,29" />
+                                 <area alt="kiwi0.tmp#id235" href="kiwi0.html#id235" coords="184,147,261,171" />
+                                 <area alt="kiwi0.tmp#id234" href="kiwi0.html#id234" coords="173,106,374,132" />
+                                 <area alt="kiwi0.tmp#id236" href="kiwi0.html#id236" coords="170,188,260,212" />
+                                 <area alt="kiwi0.tmp#id237" href="kiwi0.html#id237" coords="170,222,231,246" />
+                                 <area alt="kiwi0.tmp#id238" href="kiwi0.html#id238" coords="170,256,294,298" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id238" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id238');"
+                           <div class="floatRight"><input id="button_usedBy_id231" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id231');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id238" style="display:block">
+                           <div id="usedBy_id231" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instrepo</a></b></td>
                                  </tr>
                               </table>
@@ -47631,13 +46964,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id238" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id231" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id238');"
+                                     onclick="switchState('attributes_id231');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id238" style="display:block">
+                           <div id="attributes_id231" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -47650,7 +46983,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id245" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id238" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">local</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -47661,7 +46994,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id240" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id233" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td><b>xs:ID</b></td>
                                     <td></td>
@@ -47672,7 +47005,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id242" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id235" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">priority</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -47690,7 +47023,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id244" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id237" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pwd</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -47708,7 +47041,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id243" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id236" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">username</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -47732,12 +47065,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id238" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id238');"
+                           <div class="floatRight"><input id="button_source_id231" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id231');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id238" style="display:block">
+                           <div id="source_id231" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -47771,7 +47104,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id239"></a><div class="componentTitle">Attribute Group <span class="qname">k.instrepo.name.attribute</span></div>
+      </table><a id="id232"></a><div class="componentTitle">Attribute Group <span class="qname">k.instrepo.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -47790,29 +47123,28 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id239" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id239');"
+                           <div class="floatRight"><input id="button_diagram_id232" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id232');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id239" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html103.jpeg"
-                                   usemap="#kiwi_46_html103" /><map name="kiwi_46_html103" id="kiwi_46_html103">
-                                 <area alt="kiwi0.tmp#id240" href="kiwi0.html#id240" coords="218,0,310,42" /></map></div>
+                           <div id="diagram_id232" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html77.jpeg" usemap="#kiwi_46_html77" /><map name="kiwi_46_html77" id="kiwi_46_html77">
+                                 <area alt="kiwi0.tmp#id233" href="kiwi0.html#id233" coords="218,0,310,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id239" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id239');"
+                           <div class="floatRight"><input id="button_usedBy_id232" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id232');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id239" style="display:block">
+                           <div id="usedBy_id232" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id238" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -47822,13 +47154,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id239" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id232" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id239');"
+                                     onclick="switchState('attributes_id232');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id239" style="display:block">
+                           <div id="attributes_id232" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -47841,7 +47173,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id240" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id233" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td><b>xs:ID</b></td>
                                     <td></td>
@@ -47858,12 +47190,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id239" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id239');"
+                           <div class="floatRight"><input id="button_source_id232" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id232');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id239" style="display:block">
+                           <div id="source_id232" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -47885,7 +47217,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id241"></a><div class="componentTitle">Attribute Group <span class="qname">k.instrepo.priority.attribute</span></div>
+      </table><a id="id234"></a><div class="componentTitle">Attribute Group <span class="qname">k.instrepo.priority.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -47904,29 +47236,28 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id241" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id241');"
+                           <div class="floatRight"><input id="button_diagram_id234" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id234');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id241" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html129.jpeg"
-                                   usemap="#kiwi_46_html129" /><map name="kiwi_46_html129" id="kiwi_46_html129">
-                                 <area alt="kiwi0.tmp#id242" href="kiwi0.html#id242" coords="229,1,306,25" /></map></div>
+                           <div id="diagram_id234" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html21.jpeg" usemap="#kiwi_46_html21" /><map name="kiwi_46_html21" id="kiwi_46_html21">
+                                 <area alt="kiwi0.tmp#id235" href="kiwi0.html#id235" coords="229,1,306,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id241" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id241');"
+                           <div class="floatRight"><input id="button_usedBy_id234" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id234');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id241" style="display:block">
+                           <div id="usedBy_id234" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id238" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -47936,13 +47267,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id241" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id234" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id241');"
+                                     onclick="switchState('attributes_id234');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id241" style="display:block">
+                           <div id="attributes_id234" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -47955,7 +47286,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id242" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id235" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">priority</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -47979,12 +47310,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id241" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id241');"
+                           <div class="floatRight"><input id="button_source_id234" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id234');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id241" style="display:block">
+                           <div id="source_id234" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -48010,7 +47341,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id248"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.attlist</span></div>
+      </table><a id="id241"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -48029,37 +47360,37 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id248" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id248');"
+                           <div class="floatRight"><input id="button_diagram_id241" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id241');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id248" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html35.jpeg" usemap="#kiwi_46_html35" /><map name="kiwi_46_html35" id="kiwi_46_html35">
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="211,47,353,73" />
-                                 <area alt="kiwi0.tmp#id249" href="kiwi0.html#id249" coords="197,3,411,29" />
-                                 <area alt="kiwi0.tmp#id250" href="kiwi0.html#id250" coords="194,95,255,119" />
-                                 <area alt="kiwi0.tmp#id251" href="kiwi0.html#id251" coords="194,129,305,171" />
-                                 <area alt="kiwi0.tmp#id252" href="kiwi0.html#id252" coords="194,181,275,205" />
-                                 <area alt="kiwi0.tmp#id253" href="kiwi0.html#id253" coords="194,215,295,239" />
-                                 <area alt="kiwi0.tmp#id254" href="kiwi0.html#id254" coords="194,249,278,273" />
-                                 <area alt="kiwi0.tmp#id255" href="kiwi0.html#id255" coords="194,283,268,307" />
-                                 <area alt="kiwi0.tmp#id256" href="kiwi0.html#id256" coords="194,317,262,341" />
-                                 <area alt="kiwi0.tmp#id257" href="kiwi0.html#id257" coords="194,351,380,393" /></map></div>
+                           <div id="diagram_id241" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html17.jpeg" usemap="#kiwi_46_html17" /><map name="kiwi_46_html17" id="kiwi_46_html17">
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="211,47,353,73" />
+                                 <area alt="kiwi0.tmp#id242" href="kiwi0.html#id242" coords="197,3,411,29" />
+                                 <area alt="kiwi0.tmp#id243" href="kiwi0.html#id243" coords="194,95,255,119" />
+                                 <area alt="kiwi0.tmp#id244" href="kiwi0.html#id244" coords="194,129,305,171" />
+                                 <area alt="kiwi0.tmp#id245" href="kiwi0.html#id245" coords="194,181,275,205" />
+                                 <area alt="kiwi0.tmp#id246" href="kiwi0.html#id246" coords="194,215,295,239" />
+                                 <area alt="kiwi0.tmp#id247" href="kiwi0.html#id247" coords="194,249,278,273" />
+                                 <area alt="kiwi0.tmp#id248" href="kiwi0.html#id248" coords="194,283,268,307" />
+                                 <area alt="kiwi0.tmp#id249" href="kiwi0.html#id249" coords="194,317,262,341" />
+                                 <area alt="kiwi0.tmp#id250" href="kiwi0.html#id250" coords="194,351,380,393" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id248" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id248');"
+                           <div class="floatRight"><input id="button_usedBy_id241" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id241');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id248" style="display:block">
+                           <div id="usedBy_id241" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id247" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id240" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackage</a></b></td>
                                  </tr>
                               </table>
@@ -48069,13 +47400,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id248" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id241" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id248');"
+                                     onclick="switchState('attributes_id241');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id248" style="display:block">
+                           <div id="attributes_id241" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -48088,7 +47419,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id252" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id245" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">addarch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48099,7 +47430,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id250" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id243" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48117,7 +47448,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id251" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id244" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">forcerepo</a></b></td>
                                     <td><b>xs:IDREF</b></td>
                                     <td></td>
@@ -48135,7 +47466,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id257" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id250" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">medium</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -48146,7 +47477,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48164,7 +47495,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id254" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id247" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">onlyarch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48175,7 +47506,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id253" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id246" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">removearch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48186,7 +47517,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id256" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id249" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">script</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48197,7 +47528,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id255" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48214,12 +47545,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id248" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id248');"
+                           <div class="floatRight"><input id="button_source_id241" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id241');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id248" style="display:block">
+                           <div id="source_id241" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -48257,7 +47588,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id249"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.name.attribute</span></div>
+      </table><a id="id242"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -48276,29 +47607,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id249" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id249');"
+                           <div class="floatRight"><input id="button_diagram_id242" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id242');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id249" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html25.jpeg" usemap="#kiwi_46_html25" /><map name="kiwi_46_html25" id="kiwi_46_html25">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="256,44,322,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="245,3,387,29" /></map></div>
+                           <div id="diagram_id242" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html80.jpeg" usemap="#kiwi_46_html80" /><map name="kiwi_46_html80" id="kiwi_46_html80">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="256,44,322,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="245,3,387,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id249" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id249');"
+                           <div class="floatRight"><input id="button_usedBy_id242" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id242');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id249" style="display:block">
+                           <div id="usedBy_id242" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -48308,13 +47639,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id249" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id242" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id249');"
+                                     onclick="switchState('attributes_id242');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id249" style="display:block">
+                           <div id="attributes_id242" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -48327,7 +47658,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48351,12 +47682,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id249" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id249');"
+                           <div class="floatRight"><input id="button_source_id242" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id242');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id249" style="display:block">
+                           <div id="source_id242" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -48378,7 +47709,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id259"></a><div class="componentTitle">Attribute Group <span class="qname">k.metafile.attlist</span></div>
+      </table><a id="id252"></a><div class="componentTitle">Attribute Group <span class="qname">k.metafile.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -48397,33 +47728,34 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id259" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id259');"
+                           <div class="floatRight"><input id="button_diagram_id252" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id252');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id259" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html11.jpeg" usemap="#kiwi_46_html11" /><map name="kiwi_46_html11" id="kiwi_46_html11">
-                                 <area alt="kiwi0.tmp#id261" href="kiwi0.html#id261" coords="181,44,242,68" />
-                                 <area alt="kiwi0.tmp#id260" href="kiwi0.html#id260" coords="170,3,343,29" />
-                                 <area alt="kiwi0.tmp#id263" href="kiwi0.html#id263" coords="184,132,328,158" />
-                                 <area alt="kiwi0.tmp#id262" href="kiwi0.html#id262" coords="170,88,359,114" />
-                                 <area alt="kiwi0.tmp#id266" href="kiwi0.html#id266" coords="181,224,250,248" />
-                                 <area alt="kiwi0.tmp#id265" href="kiwi0.html#id265" coords="170,183,360,209" /></map></div>
+                           <div id="diagram_id252" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html223.jpeg"
+                                   usemap="#kiwi_46_html223" /><map name="kiwi_46_html223" id="kiwi_46_html223">
+                                 <area alt="kiwi0.tmp#id254" href="kiwi0.html#id254" coords="181,44,242,68" />
+                                 <area alt="kiwi0.tmp#id253" href="kiwi0.html#id253" coords="170,3,343,29" />
+                                 <area alt="kiwi0.tmp#id256" href="kiwi0.html#id256" coords="184,132,328,158" />
+                                 <area alt="kiwi0.tmp#id255" href="kiwi0.html#id255" coords="170,88,359,114" />
+                                 <area alt="kiwi0.tmp#id259" href="kiwi0.html#id259" coords="181,224,250,248" />
+                                 <area alt="kiwi0.tmp#id258" href="kiwi0.html#id258" coords="170,183,360,209" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id259" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id259');"
+                           <div class="floatRight"><input id="button_usedBy_id252" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id252');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id259" style="display:block">
+                           <div id="usedBy_id252" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id258" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id251" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metafile</a></b></td>
                                  </tr>
                               </table>
@@ -48433,13 +47765,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id259" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id252" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id259');"
+                                     onclick="switchState('attributes_id252');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id259" style="display:block">
+                           <div id="attributes_id252" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -48452,7 +47784,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id264" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id257" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">script</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48463,7 +47795,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id259" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">target</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48481,7 +47813,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id261" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id254" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">url</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48505,12 +47837,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id259" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id259');"
+                           <div class="floatRight"><input id="button_source_id252" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id252');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id259" style="display:block">
+                           <div id="source_id252" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -48534,7 +47866,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id260"></a><div class="componentTitle">Attribute Group <span class="qname">k.metafile.url.attribute</span></div>
+      </table><a id="id253"></a><div class="componentTitle">Attribute Group <span class="qname">k.metafile.url.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -48553,29 +47885,28 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id260" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id260');"
+                           <div class="floatRight"><input id="button_diagram_id253" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id253');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id260" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html264.jpeg"
-                                   usemap="#kiwi_46_html264" /><map name="kiwi_46_html264" id="kiwi_46_html264">
-                                 <area alt="kiwi0.tmp#id261" href="kiwi0.html#id261" coords="201,1,262,25" /></map></div>
+                           <div id="diagram_id253" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html70.jpeg" usemap="#kiwi_46_html70" /><map name="kiwi_46_html70" id="kiwi_46_html70">
+                                 <area alt="kiwi0.tmp#id254" href="kiwi0.html#id254" coords="201,1,262,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id260" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id260');"
+                           <div class="floatRight"><input id="button_usedBy_id253" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id253');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id260" style="display:block">
+                           <div id="usedBy_id253" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id259" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id252" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -48585,13 +47916,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id260" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id253" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id260');"
+                                     onclick="switchState('attributes_id253');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id260" style="display:block">
+                           <div id="attributes_id253" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -48604,7 +47935,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id261" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id254" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">url</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48628,12 +47959,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id260" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id260');"
+                           <div class="floatRight"><input id="button_source_id253" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id253');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id260" style="display:block">
+                           <div id="source_id253" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -48659,7 +47990,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id262"></a><div class="componentTitle">Attribute Group <span class="qname">k.metafile.script.attribute</span></div>
+      </table><a id="id255"></a><div class="componentTitle">Attribute Group <span class="qname">k.metafile.script.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -48678,30 +48009,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id262" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id262');"
+                           <div class="floatRight"><input id="button_diagram_id255" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id255');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id262" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html235.jpeg"
-                                   usemap="#kiwi_46_html235" /><map name="kiwi_46_html235" id="kiwi_46_html235">
-                                 <area alt="kiwi0.tmp#id264" href="kiwi0.html#id264" coords="231,44,299,68" />
-                                 <area alt="kiwi0.tmp#id263" href="kiwi0.html#id263" coords="220,3,364,29" /></map></div>
+                           <div id="diagram_id255" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html65.jpeg" usemap="#kiwi_46_html65" /><map name="kiwi_46_html65" id="kiwi_46_html65">
+                                 <area alt="kiwi0.tmp#id257" href="kiwi0.html#id257" coords="231,44,299,68" />
+                                 <area alt="kiwi0.tmp#id256" href="kiwi0.html#id256" coords="220,3,364,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id262" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id262');"
+                           <div class="floatRight"><input id="button_usedBy_id255" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id255');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id262" style="display:block">
+                           <div id="usedBy_id255" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id259" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id252" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -48711,13 +48041,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id262" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id255" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id262');"
+                                     onclick="switchState('attributes_id255');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id262" style="display:block">
+                           <div id="attributes_id255" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -48730,7 +48060,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id264" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id257" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">script</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48747,12 +48077,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id262" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id262');"
+                           <div class="floatRight"><input id="button_source_id255" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id255');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id262" style="display:block">
+                           <div id="source_id255" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -48774,7 +48104,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id263"></a><div class="componentTitle">Attribute Group <span class="qname">k.script.attribute</span></div>
+      </table><a id="id256"></a><div class="componentTitle">Attribute Group <span class="qname">k.script.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -48793,30 +48123,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id263" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id263');"
+                           <div class="floatRight"><input id="button_diagram_id256" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id256');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id263" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html239.jpeg"
-                                   usemap="#kiwi_46_html239" /><map name="kiwi_46_html239" id="kiwi_46_html239">
-                                 <area alt="kiwi0.tmp#id264" href="kiwi0.html#id264" coords="172,1,240,25" /></map></div>
+                           <div id="diagram_id256" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html68.jpeg" usemap="#kiwi_46_html68" /><map name="kiwi_46_html68" id="kiwi_46_html68">
+                                 <area alt="kiwi0.tmp#id257" href="kiwi0.html#id257" coords="172,1,240,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id263" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id263');"
+                           <div class="floatRight"><input id="button_usedBy_id256" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id256');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id263" style="display:block">
+                           <div id="usedBy_id256" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Groups </td>
-                                    <td><b><a href="kiwi0.html#id262" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.script.attribute</a></b>, <b><a href="kiwi0.html#id370" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id255" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.script.attribute</a></b>, <b><a href="kiwi0.html#id363" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.script.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -48826,13 +48155,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id263" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id256" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id263');"
+                                     onclick="switchState('attributes_id256');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id263" style="display:block">
+                           <div id="attributes_id256" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -48845,7 +48174,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id264" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id257" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">script</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48862,12 +48191,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id263" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id263');"
+                           <div class="floatRight"><input id="button_source_id256" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id256');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id263" style="display:block">
+                           <div id="source_id256" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -48889,7 +48218,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id265"></a><div class="componentTitle">Attribute Group <span class="qname">k.metafile.target.attribute</span></div>
+      </table><a id="id258"></a><div class="componentTitle">Attribute Group <span class="qname">k.metafile.target.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -48908,29 +48237,28 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id265" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id265');"
+                           <div class="floatRight"><input id="button_diagram_id258" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id258');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id265" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html275.jpeg"
-                                   usemap="#kiwi_46_html275" /><map name="kiwi_46_html275" id="kiwi_46_html275">
-                                 <area alt="kiwi0.tmp#id266" href="kiwi0.html#id266" coords="218,1,287,25" /></map></div>
+                           <div id="diagram_id258" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html29.jpeg" usemap="#kiwi_46_html29" /><map name="kiwi_46_html29" id="kiwi_46_html29">
+                                 <area alt="kiwi0.tmp#id259" href="kiwi0.html#id259" coords="218,1,287,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id265" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id265');"
+                           <div class="floatRight"><input id="button_usedBy_id258" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id258');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id265" style="display:block">
+                           <div id="usedBy_id258" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id259" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id252" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -48940,13 +48268,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id265" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id258" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id265');"
+                                     onclick="switchState('attributes_id258');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id265" style="display:block">
+                           <div id="attributes_id258" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -48959,7 +48287,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id259" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">target</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -48983,12 +48311,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id265" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id265');"
+                           <div class="floatRight"><input id="button_source_id258" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id258');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id265" style="display:block">
+                           <div id="source_id258" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -49014,7 +48342,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id268"></a><div class="componentTitle">Attribute Group <span class="qname">k.chroot.attlist</span></div>
+      </table><a id="id261"></a><div class="componentTitle">Attribute Group <span class="qname">k.chroot.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -49033,29 +48361,28 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id268" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id268');"
+                           <div class="floatRight"><input id="button_diagram_id261" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id261');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id268" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html240.jpeg"
-                                   usemap="#kiwi_46_html240" /><map name="kiwi_46_html240" id="kiwi_46_html240">
-                                 <area alt="kiwi0.tmp#id269" href="kiwi0.html#id269" coords="161,1,243,25" /></map></div>
+                           <div id="diagram_id261" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html27.jpeg" usemap="#kiwi_46_html27" /><map name="kiwi_46_html27" id="kiwi_46_html27">
+                                 <area alt="kiwi0.tmp#id262" href="kiwi0.html#id262" coords="161,1,243,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id268" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id268');"
+                           <div class="floatRight"><input id="button_usedBy_id261" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id261');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id268" style="display:block">
+                           <div id="usedBy_id261" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id267" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id260" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">chroot</a></b></td>
                                  </tr>
                               </table>
@@ -49065,13 +48392,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id268" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id261" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id268');"
+                                     onclick="switchState('attributes_id261');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id268" style="display:block">
+                           <div id="attributes_id261" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -49084,7 +48411,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id269" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id262" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">requires</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -49101,12 +48428,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id268" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id268');"
+                           <div class="floatRight"><input id="button_source_id261" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id261');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id268" style="display:block">
+                           <div id="source_id261" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -49128,7 +48455,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id273"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.attlist</span></div>
+      </table><a id="id266"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -49147,37 +48474,38 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id273" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id273');"
+                           <div class="floatRight"><input id="button_diagram_id266" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id266');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id273" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html52.jpeg" usemap="#kiwi_46_html52" /><map name="kiwi_46_html52" id="kiwi_46_html52">
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="166,47,308,73" />
-                                 <area alt="kiwi0.tmp#id274" href="kiwi0.html#id274" coords="152,3,321,29" />
-                                 <area alt="kiwi0.tmp#id275" href="kiwi0.html#id275" coords="149,95,335,137" />
-                                 <area alt="kiwi0.tmp#id276" href="kiwi0.html#id276" coords="149,147,235,171" />
-                                 <area alt="kiwi0.tmp#id278" href="kiwi0.html#id278" coords="166,228,301,254" />
-                                 <area alt="kiwi0.tmp#id277" href="kiwi0.html#id277" coords="152,184,314,210" />
-                                 <area alt="kiwi0.tmp#id280" href="kiwi0.html#id280" coords="149,276,339,318" />
-                                 <area alt="kiwi0.tmp#id282" href="kiwi0.html#id282" coords="163,372,230,396" />
-                                 <area alt="kiwi0.tmp#id281" href="kiwi0.html#id281" coords="152,331,322,357" />
-                                 <area alt="kiwi0.tmp#id283" href="kiwi0.html#id283" coords="149,413,211,437" /></map></div>
+                           <div id="diagram_id266" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html173.jpeg"
+                                   usemap="#kiwi_46_html173" /><map name="kiwi_46_html173" id="kiwi_46_html173">
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="166,47,308,73" />
+                                 <area alt="kiwi0.tmp#id267" href="kiwi0.html#id267" coords="152,3,321,29" />
+                                 <area alt="kiwi0.tmp#id268" href="kiwi0.html#id268" coords="149,95,335,137" />
+                                 <area alt="kiwi0.tmp#id269" href="kiwi0.html#id269" coords="149,147,235,171" />
+                                 <area alt="kiwi0.tmp#id271" href="kiwi0.html#id271" coords="166,228,301,254" />
+                                 <area alt="kiwi0.tmp#id270" href="kiwi0.html#id270" coords="152,184,314,210" />
+                                 <area alt="kiwi0.tmp#id273" href="kiwi0.html#id273" coords="149,276,339,318" />
+                                 <area alt="kiwi0.tmp#id275" href="kiwi0.html#id275" coords="163,372,230,396" />
+                                 <area alt="kiwi0.tmp#id274" href="kiwi0.html#id274" coords="152,331,322,357" />
+                                 <area alt="kiwi0.tmp#id276" href="kiwi0.html#id276" coords="149,413,211,437" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id273" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id273');"
+                           <div class="floatRight"><input id="button_usedBy_id266" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id266');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id273" style="display:block">
+                           <div id="usedBy_id266" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id272" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id265" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">user</a></b></td>
                                  </tr>
                               </table>
@@ -49187,13 +48515,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id273" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id266" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id273');"
+                                     onclick="switchState('attributes_id266');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id273" style="display:block">
+                           <div id="attributes_id266" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -49206,7 +48534,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id282" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id275" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">home</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -49224,7 +48552,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id275" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id268" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -49242,7 +48570,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -49260,7 +48588,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id279" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id272" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pwd</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -49278,7 +48606,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id280" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pwdformat</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -49296,7 +48624,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id276" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id269" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">realname</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -49314,7 +48642,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id283" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id276" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">shell</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -49338,12 +48666,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id273" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id273');"
+                           <div class="floatRight"><input id="button_source_id266" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id266');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id273" style="display:block">
+                           <div id="source_id266" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -49393,7 +48721,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id274"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.name.attribute</span></div>
+      </table><a id="id267"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -49412,30 +48740,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id274" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id274');"
+                           <div class="floatRight"><input id="button_diagram_id267" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id267');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id274" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html110.jpeg"
-                                   usemap="#kiwi_46_html110" /><map name="kiwi_46_html110" id="kiwi_46_html110">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="211,44,277,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="200,3,342,29" /></map></div>
+                           <div id="diagram_id267" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html103.jpeg"
+                                   usemap="#kiwi_46_html103" /><map name="kiwi_46_html103" id="kiwi_46_html103">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="211,44,277,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="200,3,342,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id274" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id274');"
+                           <div class="floatRight"><input id="button_usedBy_id267" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id267');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id274" style="display:block">
+                           <div id="usedBy_id267" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -49445,13 +48773,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id274" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id267" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id274');"
+                                     onclick="switchState('attributes_id267');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id274" style="display:block">
+                           <div id="attributes_id267" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -49464,7 +48792,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -49488,12 +48816,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id274" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id274');"
+                           <div class="floatRight"><input id="button_source_id267" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id267');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id274" style="display:block">
+                           <div id="source_id267" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -49515,7 +48843,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id277"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.pwd.attribute</span></div>
+      </table><a id="id270"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.pwd.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -49534,29 +48862,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id277" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id277');"
+                           <div class="floatRight"><input id="button_diagram_id270" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id270');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id277" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html7.jpeg" usemap="#kiwi_46_html7" /><map name="kiwi_46_html7" id="kiwi_46_html7">
-                                 <area alt="kiwi0.tmp#id279" href="kiwi0.html#id279" coords="204,44,265,68" />
-                                 <area alt="kiwi0.tmp#id278" href="kiwi0.html#id278" coords="193,3,328,29" /></map></div>
+                           <div id="diagram_id270" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html175.jpeg"
+                                   usemap="#kiwi_46_html175" /><map name="kiwi_46_html175" id="kiwi_46_html175">
+                                 <area alt="kiwi0.tmp#id272" href="kiwi0.html#id272" coords="204,44,265,68" />
+                                 <area alt="kiwi0.tmp#id271" href="kiwi0.html#id271" coords="193,3,328,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id277" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id277');"
+                           <div class="floatRight"><input id="button_usedBy_id270" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id270');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id277" style="display:block">
+                           <div id="usedBy_id270" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -49566,13 +48895,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id277" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id270" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id277');"
+                                     onclick="switchState('attributes_id270');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id277" style="display:block">
+                           <div id="attributes_id270" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -49585,7 +48914,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id279" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id272" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pwd</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -49609,12 +48938,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id277" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id277');"
+                           <div class="floatRight"><input id="button_source_id270" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id270');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id277" style="display:block">
+                           <div id="source_id270" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -49636,7 +48965,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id278"></a><div class="componentTitle">Attribute Group <span class="qname">k.pwd.attribute</span></div>
+      </table><a id="id271"></a><div class="componentTitle">Attribute Group <span class="qname">k.pwd.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -49655,29 +48984,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id278" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id278');"
+                           <div class="floatRight"><input id="button_diagram_id271" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id271');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id278" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html50.jpeg" usemap="#kiwi_46_html50" /><map name="kiwi_46_html50" id="kiwi_46_html50">
-                                 <area alt="kiwi0.tmp#id279" href="kiwi0.html#id279" coords="163,1,224,25" /></map></div>
+                           <div id="diagram_id271" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html287.jpeg"
+                                   usemap="#kiwi_46_html287" /><map name="kiwi_46_html287" id="kiwi_46_html287">
+                                 <area alt="kiwi0.tmp#id272" href="kiwi0.html#id272" coords="163,1,224,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id278" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id278');"
+                           <div class="floatRight"><input id="button_usedBy_id271" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id271');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id278" style="display:block">
+                           <div id="usedBy_id271" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Groups </td>
-                                    <td><b><a href="kiwi0.html#id352" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.pwd.attribute</a></b>, <b><a href="kiwi0.html#id277" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id345" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.pwd.attribute</a></b>, <b><a href="kiwi0.html#id270" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.pwd.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -49687,13 +49017,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id278" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id271" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id278');"
+                                     onclick="switchState('attributes_id271');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id278" style="display:block">
+                           <div id="attributes_id271" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -49706,7 +49036,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id279" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id272" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pwd</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -49730,12 +49060,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id278" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id278');"
+                           <div class="floatRight"><input id="button_source_id271" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id271');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id278" style="display:block">
+                           <div id="source_id271" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -49761,7 +49091,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id281"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.home.attribute</span></div>
+      </table><a id="id274"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.home.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -49780,28 +49110,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id281" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id281');"
+                           <div class="floatRight"><input id="button_diagram_id274" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id274');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id281" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html8.jpeg" usemap="#kiwi_46_html8" /><map name="kiwi_46_html8" id="kiwi_46_html8">
-                                 <area alt="kiwi0.tmp#id282" href="kiwi0.html#id282" coords="198,1,265,25" /></map></div>
+                           <div id="diagram_id274" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html147.jpeg"
+                                   usemap="#kiwi_46_html147" /><map name="kiwi_46_html147" id="kiwi_46_html147">
+                                 <area alt="kiwi0.tmp#id275" href="kiwi0.html#id275" coords="198,1,265,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id281" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id281');"
+                           <div class="floatRight"><input id="button_usedBy_id274" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id274');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id281" style="display:block">
+                           <div id="usedBy_id274" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -49811,13 +49142,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id281" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id274" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id281');"
+                                     onclick="switchState('attributes_id274');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id281" style="display:block">
+                           <div id="attributes_id274" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -49830,7 +49161,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id282" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id275" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">home</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -49854,12 +49185,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id281" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id281');"
+                           <div class="floatRight"><input id="button_source_id274" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id274');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id281" style="display:block">
+                           <div id="source_id274" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -49885,7 +49216,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id284"></a><div class="componentTitle">Attribute Group <span class="qname">k.users.attlist</span></div>
+      </table><a id="id277"></a><div class="componentTitle">Attribute Group <span class="qname">k.users.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -49904,30 +49235,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id284" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id284');"
+                           <div class="floatRight"><input id="button_diagram_id277" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id277');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id284" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html20.jpeg" usemap="#kiwi_46_html20" /><map name="kiwi_46_html20" id="kiwi_46_html20">
-                                 <area alt="kiwi0.tmp#id286" href="kiwi0.html#id286" coords="169,44,239,68" />
-                                 <area alt="kiwi0.tmp#id285" href="kiwi0.html#id285" coords="158,3,337,29" />
-                                 <area alt="kiwi0.tmp#id287" href="kiwi0.html#id287" coords="155,85,341,127" /></map></div>
+                           <div id="diagram_id277" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html242.jpeg"
+                                   usemap="#kiwi_46_html242" /><map name="kiwi_46_html242" id="kiwi_46_html242">
+                                 <area alt="kiwi0.tmp#id279" href="kiwi0.html#id279" coords="169,44,239,68" />
+                                 <area alt="kiwi0.tmp#id278" href="kiwi0.html#id278" coords="158,3,337,29" />
+                                 <area alt="kiwi0.tmp#id280" href="kiwi0.html#id280" coords="155,85,341,127" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id284" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id284');"
+                           <div class="floatRight"><input id="button_usedBy_id277" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id277');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id284" style="display:block">
+                           <div id="usedBy_id277" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id271" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id264" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">users</a></b></td>
                                  </tr>
                               </table>
@@ -49937,13 +49269,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id284" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id277" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id284');"
+                                     onclick="switchState('attributes_id277');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id284" style="display:block">
+                           <div id="attributes_id277" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -49956,7 +49288,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id286" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id279" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">group</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -49974,7 +49306,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id280" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -49998,12 +49330,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id284" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id284');"
+                           <div class="floatRight"><input id="button_source_id277" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id277');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id284" style="display:block">
+                           <div id="source_id277" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -50030,7 +49362,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id285"></a><div class="componentTitle">Attribute Group <span class="qname">k.users.group.attribute</span></div>
+      </table><a id="id278"></a><div class="componentTitle">Attribute Group <span class="qname">k.users.group.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -50049,29 +49381,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id285" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id285');"
+                           <div class="floatRight"><input id="button_diagram_id278" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id278');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id285" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html157.jpeg"
-                                   usemap="#kiwi_46_html157" /><map name="kiwi_46_html157" id="kiwi_46_html157">
-                                 <area alt="kiwi0.tmp#id286" href="kiwi0.html#id286" coords="207,1,277,25" /></map></div>
+                           <div id="diagram_id278" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html235.jpeg"
+                                   usemap="#kiwi_46_html235" /><map name="kiwi_46_html235" id="kiwi_46_html235">
+                                 <area alt="kiwi0.tmp#id279" href="kiwi0.html#id279" coords="207,1,277,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id285" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id285');"
+                           <div class="floatRight"><input id="button_usedBy_id278" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id278');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id285" style="display:block">
+                           <div id="usedBy_id278" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id284" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id277" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -50081,13 +49413,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id285" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id278" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id285');"
+                                     onclick="switchState('attributes_id278');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id285" style="display:block">
+                           <div id="attributes_id278" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -50100,7 +49432,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id286" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id279" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">group</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -50124,12 +49456,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id285" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id285');"
+                           <div class="floatRight"><input id="button_source_id278" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id278');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id285" style="display:block">
+                           <div id="source_id278" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -50155,7 +49487,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id289"></a><div class="componentTitle">Attribute Group <span class="qname">k.drivers.attlist</span></div>
+      </table><a id="id282"></a><div class="componentTitle">Attribute Group <span class="qname">k.drivers.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -50174,31 +49506,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id289" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id289');"
+                           <div class="floatRight"><input id="button_diagram_id282" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id282');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id289" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html120.jpeg"
-                                   usemap="#kiwi_46_html120" /><map name="kiwi_46_html120" id="kiwi_46_html120">
-                                 <area alt="kiwi0.tmp#id291" href="kiwi0.html#id291" coords="177,44,367,86" />
-                                 <area alt="kiwi0.tmp#id290" href="kiwi0.html#id290" coords="166,3,343,29" />
-                                 <area alt="kiwi0.tmp#id292" href="kiwi0.html#id292" coords="163,103,241,127" /></map></div>
+                           <div id="diagram_id282" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html46.jpeg" usemap="#kiwi_46_html46" /><map name="kiwi_46_html46" id="kiwi_46_html46">
+                                 <area alt="kiwi0.tmp#id284" href="kiwi0.html#id284" coords="177,44,367,86" />
+                                 <area alt="kiwi0.tmp#id283" href="kiwi0.html#id283" coords="166,3,343,29" />
+                                 <area alt="kiwi0.tmp#id285" href="kiwi0.html#id285" coords="163,103,241,127" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id289" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id289');"
+                           <div class="floatRight"><input id="button_usedBy_id282" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id282');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id289" style="display:block">
+                           <div id="usedBy_id282" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id288" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id281" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">drivers</a></b></td>
                                  </tr>
                               </table>
@@ -50208,13 +49539,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id289" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id282" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id289');"
+                                     onclick="switchState('attributes_id282');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id289" style="display:block">
+                           <div id="attributes_id282" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -50227,7 +49558,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id292" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id285" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -50245,7 +49576,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id291" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id284" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -50262,12 +49593,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id289" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id289');"
+                           <div class="floatRight"><input id="button_source_id282" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id282');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id289" style="display:block">
+                           <div id="source_id282" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -50294,7 +49625,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id290"></a><div class="componentTitle">Attribute Group <span class="qname">k.drivers.type.attribute</span></div>
+      </table><a id="id283"></a><div class="componentTitle">Attribute Group <span class="qname">k.drivers.type.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -50313,29 +49644,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id290" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id290');"
+                           <div class="floatRight"><input id="button_diagram_id283" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id283');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id290" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html261.jpeg"
-                                   usemap="#kiwi_46_html261" /><map name="kiwi_46_html261" id="kiwi_46_html261">
-                                 <area alt="kiwi0.tmp#id291" href="kiwi0.html#id291" coords="205,0,395,42" /></map></div>
+                           <div id="diagram_id283" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html249.jpeg"
+                                   usemap="#kiwi_46_html249" /><map name="kiwi_46_html249" id="kiwi_46_html249">
+                                 <area alt="kiwi0.tmp#id284" href="kiwi0.html#id284" coords="205,0,395,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id290" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id290');"
+                           <div class="floatRight"><input id="button_usedBy_id283" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id283');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id290" style="display:block">
+                           <div id="usedBy_id283" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id289" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id282" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -50345,13 +49676,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id290" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id283" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id290');"
+                                     onclick="switchState('attributes_id283');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id290" style="display:block">
+                           <div id="attributes_id283" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -50364,7 +49695,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id291" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id284" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -50381,12 +49712,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id290" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id290');"
+                           <div class="floatRight"><input id="button_source_id283" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id283');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id290" style="display:block">
+                           <div id="source_id283" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -50417,7 +49748,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id294"></a><div class="componentTitle">Attribute Group <span class="qname">k.repository.attlist</span></div>
+      </table><a id="id287"></a><div class="componentTitle">Attribute Group <span class="qname">k.repository.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -50436,34 +49767,34 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id294" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id294');"
+                           <div class="floatRight"><input id="button_diagram_id287" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id287');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id294" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html115.jpeg"
-                                   usemap="#kiwi_46_html115" /><map name="kiwi_46_html115" id="kiwi_46_html115">
-                                 <area alt="kiwi0.tmp#id296" href="kiwi0.html#id296" coords="195,44,385,86" />
-                                 <area alt="kiwi0.tmp#id295" href="kiwi0.html#id295" coords="184,3,379,29" />
-                                 <area alt="kiwi0.tmp#id297" href="kiwi0.html#id297" coords="181,103,259,127" />
-                                 <area alt="kiwi0.tmp#id298" href="kiwi0.html#id298" coords="181,137,371,179" />
-                                 <area alt="kiwi0.tmp#id299" href="kiwi0.html#id299" coords="181,189,242,213" />
-                                 <area alt="kiwi0.tmp#id300" href="kiwi0.html#id300" coords="181,223,300,265" /></map></div>
+                           <div id="diagram_id287" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html253.jpeg"
+                                   usemap="#kiwi_46_html253" /><map name="kiwi_46_html253" id="kiwi_46_html253">
+                                 <area alt="kiwi0.tmp#id289" href="kiwi0.html#id289" coords="195,44,385,86" />
+                                 <area alt="kiwi0.tmp#id288" href="kiwi0.html#id288" coords="184,3,379,29" />
+                                 <area alt="kiwi0.tmp#id290" href="kiwi0.html#id290" coords="181,103,259,127" />
+                                 <area alt="kiwi0.tmp#id291" href="kiwi0.html#id291" coords="181,137,371,179" />
+                                 <area alt="kiwi0.tmp#id292" href="kiwi0.html#id292" coords="181,189,242,213" />
+                                 <area alt="kiwi0.tmp#id293" href="kiwi0.html#id293" coords="181,223,300,265" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id294" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id294');"
+                           <div class="floatRight"><input id="button_usedBy_id287" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id287');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id294" style="display:block">
+                           <div id="usedBy_id287" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id293" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id286" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repository</a></b></td>
                                  </tr>
                               </table>
@@ -50473,13 +49804,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id294" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id287" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id294');"
+                                     onclick="switchState('attributes_id287');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id294" style="display:block">
+                           <div id="attributes_id287" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -50492,7 +49823,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id299" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id292" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">alias</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -50503,7 +49834,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id300" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id293" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">priority</a></b></td>
                                     <td><b>xs:integer</b></td>
                                     <td></td>
@@ -50514,7 +49845,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id297" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id290" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -50532,7 +49863,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id298" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id291" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">status</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -50543,7 +49874,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id289" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -50567,12 +49898,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id294" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id294');"
+                           <div class="floatRight"><input id="button_source_id287" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id287');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id294" style="display:block">
+                           <div id="source_id287" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -50609,7 +49940,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id295"></a><div class="componentTitle">Attribute Group <span class="qname">k.repository.type.attribute</span></div>
+      </table><a id="id288"></a><div class="componentTitle">Attribute Group <span class="qname">k.repository.type.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -50628,28 +49959,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id295" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id295');"
+                           <div class="floatRight"><input id="button_diagram_id288" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id288');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id295" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html39.jpeg" usemap="#kiwi_46_html39" /><map name="kiwi_46_html39" id="kiwi_46_html39">
-                                 <area alt="kiwi0.tmp#id296" href="kiwi0.html#id296" coords="223,0,413,42" /></map></div>
+                           <div id="diagram_id288" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html125.jpeg"
+                                   usemap="#kiwi_46_html125" /><map name="kiwi_46_html125" id="kiwi_46_html125">
+                                 <area alt="kiwi0.tmp#id289" href="kiwi0.html#id289" coords="223,0,413,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id295" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id295');"
+                           <div class="floatRight"><input id="button_usedBy_id288" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id288');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id295" style="display:block">
+                           <div id="usedBy_id288" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -50659,13 +49991,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id295" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id288" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id295');"
+                                     onclick="switchState('attributes_id288');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id295" style="display:block">
+                           <div id="attributes_id288" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -50678,7 +50010,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id289" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -50702,12 +50034,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id295" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id295');"
+                           <div class="floatRight"><input id="button_source_id288" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id288');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id295" style="display:block">
+                           <div id="source_id288" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -50748,7 +50080,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id303"></a><div class="componentTitle">Attribute Group <span class="qname">k.package.attlist</span></div>
+      </table><a id="id296"></a><div class="componentTitle">Attribute Group <span class="qname">k.package.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -50767,34 +50099,34 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id303" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id303');"
+                           <div class="floatRight"><input id="button_diagram_id296" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id296');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id303" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html135.jpeg"
-                                   usemap="#kiwi_46_html135" /><map name="kiwi_46_html135" id="kiwi_46_html135">
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="186,47,328,73" />
-                                 <area alt="kiwi0.tmp#id304" href="kiwi0.html#id304" coords="172,3,361,29" />
-                                 <area alt="kiwi0.tmp#id305" href="kiwi0.html#id305" coords="169,95,230,119" />
-                                 <area alt="kiwi0.tmp#id306" href="kiwi0.html#id306" coords="169,129,251,153" />
-                                 <area alt="kiwi0.tmp#id307" href="kiwi0.html#id307" coords="169,163,293,205" />
-                                 <area alt="kiwi0.tmp#id308" href="kiwi0.html#id308" coords="169,215,293,257" /></map></div>
+                           <div id="diagram_id296" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html163.jpeg"
+                                   usemap="#kiwi_46_html163" /><map name="kiwi_46_html163" id="kiwi_46_html163">
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="186,47,328,73" />
+                                 <area alt="kiwi0.tmp#id297" href="kiwi0.html#id297" coords="172,3,361,29" />
+                                 <area alt="kiwi0.tmp#id298" href="kiwi0.html#id298" coords="169,95,230,119" />
+                                 <area alt="kiwi0.tmp#id299" href="kiwi0.html#id299" coords="169,129,251,153" />
+                                 <area alt="kiwi0.tmp#id300" href="kiwi0.html#id300" coords="169,163,293,205" />
+                                 <area alt="kiwi0.tmp#id301" href="kiwi0.html#id301" coords="169,215,293,257" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id303" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id303');"
+                           <div class="floatRight"><input id="button_usedBy_id296" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id296');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id303" style="display:block">
+                           <div id="usedBy_id296" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id302" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id295" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">package</a></b></td>
                                  </tr>
                               </table>
@@ -50804,13 +50136,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id303" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id296" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id303');"
+                                     onclick="switchState('attributes_id296');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id303" style="display:block">
+                           <div id="attributes_id296" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -50823,7 +50155,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id305" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id298" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -50841,7 +50173,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id307" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id300" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootdelete</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -50852,7 +50184,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id308" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootinclude</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -50863,7 +50195,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -50881,7 +50213,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id306" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id299" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">replaces</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -50905,12 +50237,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id303" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id303');"
+                           <div class="floatRight"><input id="button_source_id296" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id296');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id303" style="display:block">
+                           <div id="source_id296" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -50944,7 +50276,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id304"></a><div class="componentTitle">Attribute Group <span class="qname">k.package.name.attribute</span></div>
+      </table><a id="id297"></a><div class="componentTitle">Attribute Group <span class="qname">k.package.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -50963,30 +50295,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id304" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id304');"
+                           <div class="floatRight"><input id="button_diagram_id297" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id297');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id304" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html198.jpeg"
-                                   usemap="#kiwi_46_html198" /><map name="kiwi_46_html198" id="kiwi_46_html198">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="231,44,297,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="220,3,362,29" /></map></div>
+                           <div id="diagram_id297" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html47.jpeg" usemap="#kiwi_46_html47" /><map name="kiwi_46_html47" id="kiwi_46_html47">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="231,44,297,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="220,3,362,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id304" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id304');"
+                           <div class="floatRight"><input id="button_usedBy_id297" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id297');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id304" style="display:block">
+                           <div id="usedBy_id297" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -50996,13 +50327,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id304" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id297" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id304');"
+                                     onclick="switchState('attributes_id297');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id304" style="display:block">
+                           <div id="attributes_id297" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -51015,7 +50346,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -51039,12 +50370,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id304" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id304');"
+                           <div class="floatRight"><input id="button_source_id297" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id297');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id304" style="display:block">
+                           <div id="source_id297" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -51066,7 +50397,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id310"></a><div class="componentTitle">Attribute Group <span class="qname">k.opensusepattern.attlist</span></div>
+      </table><a id="id303"></a><div class="componentTitle">Attribute Group <span class="qname">k.opensusepattern.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -51085,31 +50416,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id310" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id310');"
+                           <div class="floatRight"><input id="button_diagram_id303" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id303');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id310" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html178.jpeg"
-                                   usemap="#kiwi_46_html178" /><map name="kiwi_46_html178" id="kiwi_46_html178">
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="233,47,375,73" />
-                                 <area alt="kiwi0.tmp#id311" href="kiwi0.html#id311" coords="219,3,455,29" />
-                                 <area alt="kiwi0.tmp#id312" href="kiwi0.html#id312" coords="216,95,277,119" /></map></div>
+                           <div id="diagram_id303" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html91.jpeg" usemap="#kiwi_46_html91" /><map name="kiwi_46_html91" id="kiwi_46_html91">
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="233,47,375,73" />
+                                 <area alt="kiwi0.tmp#id304" href="kiwi0.html#id304" coords="219,3,455,29" />
+                                 <area alt="kiwi0.tmp#id305" href="kiwi0.html#id305" coords="216,95,277,119" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id310" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id310');"
+                           <div class="floatRight"><input id="button_usedBy_id303" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id303');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id310" style="display:block">
+                           <div id="usedBy_id303" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id309" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id302" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensusePattern</a></b></td>
                                  </tr>
                               </table>
@@ -51119,13 +50449,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id310" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id303" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id310');"
+                                     onclick="switchState('attributes_id303');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id310" style="display:block">
+                           <div id="attributes_id303" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -51138,7 +50468,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id312" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id305" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -51156,7 +50486,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -51180,12 +50510,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id310" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id310');"
+                           <div class="floatRight"><input id="button_source_id303" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id303');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id310" style="display:block">
+                           <div id="source_id303" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -51212,7 +50542,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id311"></a><div class="componentTitle">Attribute Group <span class="qname">k.opensusepattern.name.attribute</span></div>
+      </table><a id="id304"></a><div class="componentTitle">Attribute Group <span class="qname">k.opensusepattern.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -51231,29 +50561,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id311" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id311');"
+                           <div class="floatRight"><input id="button_diagram_id304" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id304');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id311" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html93.jpeg" usemap="#kiwi_46_html93" /><map name="kiwi_46_html93" id="kiwi_46_html93">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="278,44,344,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="267,3,409,29" /></map></div>
+                           <div id="diagram_id304" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html162.jpeg"
+                                   usemap="#kiwi_46_html162" /><map name="kiwi_46_html162" id="kiwi_46_html162">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="278,44,344,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="267,3,409,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id311" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id311');"
+                           <div class="floatRight"><input id="button_usedBy_id304" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id304');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id311" style="display:block">
+                           <div id="usedBy_id304" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id310" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -51263,13 +50594,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id311" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id304" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id311');"
+                                     onclick="switchState('attributes_id304');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id311" style="display:block">
+                           <div id="attributes_id304" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -51282,7 +50613,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -51306,12 +50637,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id311" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id311');"
+                           <div class="floatRight"><input id="button_source_id304" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id304');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id311" style="display:block">
+                           <div id="source_id304" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -51333,7 +50664,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id314"></a><div class="componentTitle">Attribute Group <span class="qname">k.rhelgroup.attlist</span></div>
+      </table><a id="id307"></a><div class="componentTitle">Attribute Group <span class="qname">k.rhelgroup.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -51352,31 +50683,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id314" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id314');"
+                           <div class="floatRight"><input id="button_diagram_id307" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id307');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id314" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html253.jpeg"
-                                   usemap="#kiwi_46_html253" /><map name="kiwi_46_html253" id="kiwi_46_html253">
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="196,47,338,73" />
-                                 <area alt="kiwi0.tmp#id315" href="kiwi0.html#id315" coords="182,3,381,29" />
-                                 <area alt="kiwi0.tmp#id316" href="kiwi0.html#id316" coords="179,95,240,119" /></map></div>
+                           <div id="diagram_id307" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html112.jpeg"
+                                   usemap="#kiwi_46_html112" /><map name="kiwi_46_html112" id="kiwi_46_html112">
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="196,47,338,73" />
+                                 <area alt="kiwi0.tmp#id308" href="kiwi0.html#id308" coords="182,3,381,29" />
+                                 <area alt="kiwi0.tmp#id309" href="kiwi0.html#id309" coords="179,95,240,119" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id314" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id314');"
+                           <div class="floatRight"><input id="button_usedBy_id307" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id307');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id314" style="display:block">
+                           <div id="usedBy_id307" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id313" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id306" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rhelGroup</a></b></td>
                                  </tr>
                               </table>
@@ -51386,13 +50717,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id314" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id307" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id314');"
+                                     onclick="switchState('attributes_id307');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id314" style="display:block">
+                           <div id="attributes_id307" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -51405,7 +50736,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id316" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id309" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -51423,7 +50754,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -51447,12 +50778,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id314" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id314');"
+                           <div class="floatRight"><input id="button_source_id307" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id307');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id314" style="display:block">
+                           <div id="source_id307" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -51479,7 +50810,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id315"></a><div class="componentTitle">Attribute Group <span class="qname">k.rhelgroup.name.attribute</span></div>
+      </table><a id="id308"></a><div class="componentTitle">Attribute Group <span class="qname">k.rhelgroup.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -51498,30 +50829,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id315" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id315');"
+                           <div class="floatRight"><input id="button_diagram_id308" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id308');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id315" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html132.jpeg"
-                                   usemap="#kiwi_46_html132" /><map name="kiwi_46_html132" id="kiwi_46_html132">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="241,44,307,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="230,3,372,29" /></map></div>
+                           <div id="diagram_id308" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html97.jpeg" usemap="#kiwi_46_html97" /><map name="kiwi_46_html97" id="kiwi_46_html97">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="241,44,307,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="230,3,372,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id315" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id315');"
+                           <div class="floatRight"><input id="button_usedBy_id308" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id308');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id315" style="display:block">
+                           <div id="usedBy_id308" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id314" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id307" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -51531,13 +50861,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id315" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id308" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id315');"
+                                     onclick="switchState('attributes_id308');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id315" style="display:block">
+                           <div id="attributes_id308" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -51550,7 +50880,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -51574,12 +50904,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id315" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id315');"
+                           <div class="floatRight"><input id="button_source_id308" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id308');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id315" style="display:block">
+                           <div id="source_id308" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -51601,7 +50931,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id318"></a><div class="componentTitle">Attribute Group <span class="qname">k.opensuseproduct.attlist</span></div>
+      </table><a id="id311"></a><div class="componentTitle">Attribute Group <span class="qname">k.opensuseproduct.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -51620,30 +50950,31 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id318" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id318');"
+                           <div class="floatRight"><input id="button_diagram_id311" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id311');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id318" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html14.jpeg" usemap="#kiwi_46_html14" /><map name="kiwi_46_html14" id="kiwi_46_html14">
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="237,47,379,73" />
-                                 <area alt="kiwi0.tmp#id319" href="kiwi0.html#id319" coords="223,3,463,29" />
-                                 <area alt="kiwi0.tmp#id320" href="kiwi0.html#id320" coords="220,95,281,119" /></map></div>
+                           <div id="diagram_id311" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html139.jpeg"
+                                   usemap="#kiwi_46_html139" /><map name="kiwi_46_html139" id="kiwi_46_html139">
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="237,47,379,73" />
+                                 <area alt="kiwi0.tmp#id312" href="kiwi0.html#id312" coords="223,3,463,29" />
+                                 <area alt="kiwi0.tmp#id313" href="kiwi0.html#id313" coords="220,95,281,119" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id318" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id318');"
+                           <div class="floatRight"><input id="button_usedBy_id311" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id311');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id318" style="display:block">
+                           <div id="usedBy_id311" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id317" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id310" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensuseProduct</a></b></td>
                                  </tr>
                               </table>
@@ -51653,13 +50984,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id318" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id311" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id318');"
+                                     onclick="switchState('attributes_id311');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id318" style="display:block">
+                           <div id="attributes_id311" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -51672,7 +51003,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id320" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id313" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -51690,7 +51021,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -51714,12 +51045,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id318" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id318');"
+                           <div class="floatRight"><input id="button_source_id311" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id311');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id318" style="display:block">
+                           <div id="source_id311" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -51746,7 +51077,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id319"></a><div class="componentTitle">Attribute Group <span class="qname">k.opensuseproduct.name.attribute</span></div>
+      </table><a id="id312"></a><div class="componentTitle">Attribute Group <span class="qname">k.opensuseproduct.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -51765,29 +51096,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id319" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id319');"
+                           <div class="floatRight"><input id="button_diagram_id312" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id312');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id319" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html55.jpeg" usemap="#kiwi_46_html55" /><map name="kiwi_46_html55" id="kiwi_46_html55">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="282,44,348,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="271,3,413,29" /></map></div>
+                           <div id="diagram_id312" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html106.jpeg"
+                                   usemap="#kiwi_46_html106" /><map name="kiwi_46_html106" id="kiwi_46_html106">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="282,44,348,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="271,3,413,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id319" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id319');"
+                           <div class="floatRight"><input id="button_usedBy_id312" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id312');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id319" style="display:block">
+                           <div id="usedBy_id312" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id318" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id311" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -51797,13 +51129,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id319" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id312" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id319');"
+                                     onclick="switchState('attributes_id312');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id319" style="display:block">
+                           <div id="attributes_id312" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -51816,7 +51148,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -51840,12 +51172,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id319" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id319');"
+                           <div class="floatRight"><input id="button_source_id312" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id312');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id319" style="display:block">
+                           <div id="source_id312" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -51867,7 +51199,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id322"></a><div class="componentTitle">Attribute Group <span class="qname">k.ignore.attlist</span></div>
+      </table><a id="id315"></a><div class="componentTitle">Attribute Group <span class="qname">k.ignore.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -51886,30 +51218,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id322" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id322');"
+                           <div class="floatRight"><input id="button_diagram_id315" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id315');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id322" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html256.jpeg"
-                                   usemap="#kiwi_46_html256" /><map name="kiwi_46_html256" id="kiwi_46_html256">
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="177,47,319,73" />
-                                 <area alt="kiwi0.tmp#id323" href="kiwi0.html#id323" coords="163,3,343,29" /></map></div>
+                           <div id="diagram_id315" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html254.jpeg"
+                                   usemap="#kiwi_46_html254" /><map name="kiwi_46_html254" id="kiwi_46_html254">
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="177,47,319,73" />
+                                 <area alt="kiwi0.tmp#id316" href="kiwi0.html#id316" coords="163,3,343,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id322" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id322');"
+                           <div class="floatRight"><input id="button_usedBy_id315" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id315');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id322" style="display:block">
+                           <div id="usedBy_id315" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id314" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ignore</a></b></td>
                                  </tr>
                               </table>
@@ -51919,13 +51251,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id322" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id315" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id322');"
+                                     onclick="switchState('attributes_id315');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id322" style="display:block">
+                           <div id="attributes_id315" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -51938,7 +51270,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -51962,12 +51294,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id322" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id322');"
+                           <div class="floatRight"><input id="button_source_id315" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id315');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id322" style="display:block">
+                           <div id="source_id315" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -51989,7 +51321,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id323"></a><div class="componentTitle">Attribute Group <span class="qname">k.ignore.name.attribute</span></div>
+      </table><a id="id316"></a><div class="componentTitle">Attribute Group <span class="qname">k.ignore.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -52008,30 +51340,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id323" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id323');"
+                           <div class="floatRight"><input id="button_diagram_id316" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id316');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id323" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html226.jpeg"
-                                   usemap="#kiwi_46_html226" /><map name="kiwi_46_html226" id="kiwi_46_html226">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="222,44,288,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="211,3,353,29" /></map></div>
+                           <div id="diagram_id316" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html176.jpeg"
+                                   usemap="#kiwi_46_html176" /><map name="kiwi_46_html176" id="kiwi_46_html176">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="222,44,288,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="211,3,353,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id323" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id323');"
+                           <div class="floatRight"><input id="button_usedBy_id316" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id316');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id323" style="display:block">
+                           <div id="usedBy_id316" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id322" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id315" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.ignore.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -52041,13 +51373,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id323" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id316" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id323');"
+                                     onclick="switchState('attributes_id316');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id323" style="display:block">
+                           <div id="attributes_id316" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -52060,7 +51392,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -52084,12 +51416,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id323" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id323');"
+                           <div class="floatRight"><input id="button_source_id316" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id316');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id323" style="display:block">
+                           <div id="source_id316" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -52111,7 +51443,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id325"></a><div class="componentTitle">Attribute Group <span class="qname">k.archive.attlist</span></div>
+      </table><a id="id318"></a><div class="componentTitle">Attribute Group <span class="qname">k.archive.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -52130,31 +51462,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id325" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id325');"
+                           <div class="floatRight"><input id="button_diagram_id318" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id318');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id325" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html172.jpeg"
-                                   usemap="#kiwi_46_html172" /><map name="kiwi_46_html172" id="kiwi_46_html172">
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="181,47,323,73" />
-                                 <area alt="kiwi0.tmp#id326" href="kiwi0.html#id326" coords="167,3,351,29" />
-                                 <area alt="kiwi0.tmp#id327" href="kiwi0.html#id327" coords="164,95,288,137" /></map></div>
+                           <div id="diagram_id318" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html62.jpeg" usemap="#kiwi_46_html62" /><map name="kiwi_46_html62" id="kiwi_46_html62">
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="181,47,323,73" />
+                                 <area alt="kiwi0.tmp#id319" href="kiwi0.html#id319" coords="167,3,351,29" />
+                                 <area alt="kiwi0.tmp#id320" href="kiwi0.html#id320" coords="164,95,288,137" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id325" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id325');"
+                           <div class="floatRight"><input id="button_usedBy_id318" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id318');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id325" style="display:block">
+                           <div id="usedBy_id318" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id324" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id317" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">archive</a></b></td>
                                  </tr>
                               </table>
@@ -52164,13 +51495,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id325" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id318" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id325');"
+                                     onclick="switchState('attributes_id318');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id325" style="display:block">
+                           <div id="attributes_id318" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -52183,7 +51514,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id327" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id320" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootinclude</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -52194,7 +51525,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -52218,12 +51549,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id325" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id325');"
+                           <div class="floatRight"><input id="button_source_id318" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id318');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id325" style="display:block">
+                           <div id="source_id318" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -52246,7 +51577,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id326"></a><div class="componentTitle">Attribute Group <span class="qname">k.archive.name.attribute</span></div>
+      </table><a id="id319"></a><div class="componentTitle">Attribute Group <span class="qname">k.archive.name.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -52265,29 +51596,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id326" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id326');"
+                           <div class="floatRight"><input id="button_diagram_id319" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id319');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id326" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html64.jpeg" usemap="#kiwi_46_html64" /><map name="kiwi_46_html64" id="kiwi_46_html64">
-                                 <area alt="kiwi0.tmp#id6" href="kiwi0.html#id6" coords="226,44,292,68" />
-                                 <area alt="kiwi0.tmp#id5" href="kiwi0.html#id5" coords="215,3,357,29" /></map></div>
+                           <div id="diagram_id319" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html257.jpeg"
+                                   usemap="#kiwi_46_html257" /><map name="kiwi_46_html257" id="kiwi_46_html257">
+                                 <area alt="kiwi0.tmp#id120" href="kiwi0.html#id120" coords="226,44,292,68" />
+                                 <area alt="kiwi0.tmp#id119" href="kiwi0.html#id119" coords="215,3,357,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id326" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id326');"
+                           <div class="floatRight"><input id="button_usedBy_id319" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id319');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id326" style="display:block">
+                           <div id="usedBy_id319" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id325" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id318" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -52297,13 +51629,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id326" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id319" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id326');"
+                                     onclick="switchState('attributes_id319');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id326" style="display:block">
+                           <div id="attributes_id319" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -52316,7 +51648,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">name</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -52340,12 +51672,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id326" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id326');"
+                           <div class="floatRight"><input id="button_source_id319" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id319');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id326" style="display:block">
+                           <div id="source_id319" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -52367,7 +51699,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id328"></a><div class="componentTitle">Attribute Group <span class="qname">k.packages.attlist</span></div>
+      </table><a id="id321"></a><div class="componentTitle">Attribute Group <span class="qname">k.packages.attlist</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -52386,31 +51718,32 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id328" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id328');"
+                           <div class="floatRight"><input id="button_diagram_id321" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id321');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id328" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html38.jpeg" usemap="#kiwi_46_html38" /><map name="kiwi_46_html38" id="kiwi_46_html38">
-                                 <area alt="kiwi0.tmp#id330" href="kiwi0.html#id330" coords="189,44,379,86" />
-                                 <area alt="kiwi0.tmp#id329" href="kiwi0.html#id329" coords="178,3,367,29" />
-                                 <area alt="kiwi0.tmp#id331" href="kiwi0.html#id331" coords="175,103,253,127" />
-                                 <area alt="kiwi0.tmp#id332" href="kiwi0.html#id332" coords="175,137,365,179" /></map></div>
+                           <div id="diagram_id321" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html111.jpeg"
+                                   usemap="#kiwi_46_html111" /><map name="kiwi_46_html111" id="kiwi_46_html111">
+                                 <area alt="kiwi0.tmp#id323" href="kiwi0.html#id323" coords="189,44,379,86" />
+                                 <area alt="kiwi0.tmp#id322" href="kiwi0.html#id322" coords="178,3,367,29" />
+                                 <area alt="kiwi0.tmp#id324" href="kiwi0.html#id324" coords="175,103,253,127" />
+                                 <area alt="kiwi0.tmp#id325" href="kiwi0.html#id325" coords="175,137,365,179" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id328" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id328');"
+                           <div class="floatRight"><input id="button_usedBy_id321" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id321');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id328" style="display:block">
+                           <div id="usedBy_id321" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Element </td>
-                                    <td><b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packages</a></b></td>
                                  </tr>
                               </table>
@@ -52420,13 +51753,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id328" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id321" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id328');"
+                                     onclick="switchState('attributes_id321');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id328" style="display:block">
+                           <div id="attributes_id321" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -52439,7 +51772,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id332" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id325" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">patternType</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -52450,7 +51783,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id331" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id324" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -52461,7 +51794,7 @@
                                     </td>
                                  </tr>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id330" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id323" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -52478,12 +51811,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id328" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id328');"
+                           <div class="floatRight"><input id="button_source_id321" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id321');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id328" style="display:block">
+                           <div id="source_id321" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -52514,7 +51847,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id329"></a><div class="componentTitle">Attribute Group <span class="qname">k.packages.type.attribute</span></div>
+      </table><a id="id322"></a><div class="componentTitle">Attribute Group <span class="qname">k.packages.type.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -52533,29 +51866,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id329" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id329');"
+                           <div class="floatRight"><input id="button_diagram_id322" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id322');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id329" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html156.jpeg"
-                                   usemap="#kiwi_46_html156" /><map name="kiwi_46_html156" id="kiwi_46_html156">
-                                 <area alt="kiwi0.tmp#id330" href="kiwi0.html#id330" coords="217,0,407,42" /></map></div>
+                           <div id="diagram_id322" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html209.jpeg"
+                                   usemap="#kiwi_46_html209" /><map name="kiwi_46_html209" id="kiwi_46_html209">
+                                 <area alt="kiwi0.tmp#id323" href="kiwi0.html#id323" coords="217,0,407,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id329" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id329');"
+                           <div class="floatRight"><input id="button_usedBy_id322" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id322');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id329" style="display:block">
+                           <div id="usedBy_id322" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id328" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.attlist</a></b></td>
                                  </tr>
                               </table>
@@ -52565,13 +51898,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id329" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id322" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id329');"
+                                     onclick="switchState('attributes_id322');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id329" style="display:block">
+                           <div id="attributes_id322" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -52584,7 +51917,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id330" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id323" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -52601,12 +51934,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id329" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id329');"
+                           <div class="floatRight"><input id="button_source_id322" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id322');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id329" style="display:block">
+                           <div id="source_id322" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -52645,7 +51978,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id333"></a><div class="componentTitle">Attribute Group <span class="qname">k.replaces.attribute</span></div>
+      </table><a id="id326"></a><div class="componentTitle">Attribute Group <span class="qname">k.replaces.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -52664,29 +51997,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id333" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id333');"
+                           <div class="floatRight"><input id="button_diagram_id326" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id326');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id333" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html260.jpeg"
-                                   usemap="#kiwi_46_html260" /><map name="kiwi_46_html260" id="kiwi_46_html260">
-                                 <area alt="kiwi0.tmp#id334" href="kiwi0.html#id334" coords="186,1,268,25" /></map></div>
+                           <div id="diagram_id326" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html187.jpeg"
+                                   usemap="#kiwi_46_html187" /><map name="kiwi_46_html187" id="kiwi_46_html187">
+                                 <area alt="kiwi0.tmp#id327" href="kiwi0.html#id327" coords="186,1,268,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id333" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id333');"
+                           <div class="floatRight"><input id="button_usedBy_id326" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id326');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id333" style="display:block">
+                           <div id="usedBy_id326" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id372" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id365" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.replaces.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -52696,13 +52029,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id333" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id326" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id333');"
+                                     onclick="switchState('attributes_id326');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id333" style="display:block">
+                           <div id="attributes_id326" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -52715,7 +52048,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id334" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id327" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">replaces</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -52739,12 +52072,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id333" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id333');"
+                           <div class="floatRight"><input id="button_source_id326" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id326');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id333" style="display:block">
+                           <div id="source_id326" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -52770,7 +52103,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id335"></a><div class="componentTitle">Attribute Group <span class="qname">k.bootinclude.attribute</span></div>
+      </table><a id="id328"></a><div class="componentTitle">Attribute Group <span class="qname">k.bootinclude.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -52789,30 +52122,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id335" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id335');"
+                           <div class="floatRight"><input id="button_diagram_id328" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id328');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id335" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html272.jpeg"
-                                   usemap="#kiwi_46_html272" /><map name="kiwi_46_html272" id="kiwi_46_html272">
-                                 <area alt="kiwi0.tmp#id336" href="kiwi0.html#id336" coords="205,0,329,42" /></map></div>
+                           <div id="diagram_id328" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html73.jpeg" usemap="#kiwi_46_html73" /><map name="kiwi_46_html73" id="kiwi_46_html73">
+                                 <area alt="kiwi0.tmp#id329" href="kiwi0.html#id329" coords="205,0,329,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id335" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id335');"
+                           <div class="floatRight"><input id="button_usedBy_id328" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id328');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id335" style="display:block">
+                           <div id="usedBy_id328" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Groups </td>
-                                    <td><b><a href="kiwi0.html#id375" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.bootinclude.attribute</a></b>, <b><a href="kiwi0.html#id373" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id368" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.bootinclude.attribute</a></b>, <b><a href="kiwi0.html#id366" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.bootinclude.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -52822,13 +52154,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id335" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id328" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id335');"
+                                     onclick="switchState('attributes_id328');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id335" style="display:block">
+                           <div id="attributes_id328" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -52841,7 +52173,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id336" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id329" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootinclude</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -52858,12 +52190,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id335" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id335');"
+                           <div class="floatRight"><input id="button_source_id328" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id328');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id335" style="display:block">
+                           <div id="source_id328" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -52885,7 +52217,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id337"></a><div class="componentTitle">Attribute Group <span class="qname">k.bootdelete.attribute</span></div>
+      </table><a id="id330"></a><div class="componentTitle">Attribute Group <span class="qname">k.bootdelete.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -52904,29 +52236,28 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id337" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id337');"
+                           <div class="floatRight"><input id="button_diagram_id330" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id330');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id337" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html143.jpeg"
-                                   usemap="#kiwi_46_html143" /><map name="kiwi_46_html143" id="kiwi_46_html143">
-                                 <area alt="kiwi0.tmp#id338" href="kiwi0.html#id338" coords="198,0,322,42" /></map></div>
+                           <div id="diagram_id330" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html24.jpeg" usemap="#kiwi_46_html24" /><map name="kiwi_46_html24" id="kiwi_46_html24">
+                                 <area alt="kiwi0.tmp#id331" href="kiwi0.html#id331" coords="198,0,322,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id337" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id337');"
+                           <div class="floatRight"><input id="button_usedBy_id330" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id330');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id337" style="display:block">
+                           <div id="usedBy_id330" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id374" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id367" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.bootdelete.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -52936,13 +52267,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id337" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id330" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id337');"
+                                     onclick="switchState('attributes_id330');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id337" style="display:block">
+                           <div id="attributes_id330" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -52955,7 +52286,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id338" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id331" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootdelete</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -52972,12 +52303,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id337" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id337');"
+                           <div class="floatRight"><input id="button_source_id330" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id330');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id337" style="display:block">
+                           <div id="source_id330" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -52999,7 +52330,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id339"></a><div class="componentTitle">Attribute Group <span class="qname">k.arch.attribute</span></div>
+      </table><a id="id332"></a><div class="componentTitle">Attribute Group <span class="qname">k.arch.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -53018,35 +52349,35 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id339" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id339');"
+                           <div class="floatRight"><input id="button_diagram_id332" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id332');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id339" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html265.jpeg"
-                                   usemap="#kiwi_46_html265" /><map name="kiwi_46_html265" id="kiwi_46_html265">
-                                 <area alt="kiwi0.tmp#id340" href="kiwi0.html#id340" coords="165,1,226,25" /></map></div>
+                           <div id="diagram_id332" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html186.jpeg"
+                                   usemap="#kiwi_46_html186" /><map name="kiwi_46_html186" id="kiwi_46_html186">
+                                 <area alt="kiwi0.tmp#id333" href="kiwi0.html#id333" coords="165,1,226,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id339" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id339');"
+                           <div class="floatRight"><input id="button_usedBy_id332" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id332');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id339" style="display:block">
+                           <div id="usedBy_id332" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Groups </td>
-                                    <td><b><a href="kiwi0.html#id349" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.arch.attribute</a></b>, <b><a href="kiwi0.html#id350" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.arch.attribute</a></b>, <b><a href="kiwi0.html#id355" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.arch.attribute</a></b>, <b><a href="kiwi0.html#id357" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.arch.attribute</a></b>, <b><a href="kiwi0.html#id371" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.arch.attribute</a></b>, <b><a href="kiwi0.html#id358" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.arch.attribute</a></b>, <b><a href="kiwi0.html#id356" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id342" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.arch.attribute</a></b>, <b><a href="kiwi0.html#id343" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.arch.attribute</a></b>, <b><a href="kiwi0.html#id348" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.arch.attribute</a></b>, <b><a href="kiwi0.html#id350" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.arch.attribute</a></b>, <b><a href="kiwi0.html#id364" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.arch.attribute</a></b>, <b><a href="kiwi0.html#id351" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.arch.attribute</a></b>, <b><a href="kiwi0.html#id349" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.arch.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -53056,13 +52387,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id339" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id332" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id339');"
+                                     onclick="switchState('attributes_id332');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id339" style="display:block">
+                           <div id="attributes_id332" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -53075,7 +52406,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id340" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id333" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -53099,12 +52430,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id339" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id339');"
+                           <div class="floatRight"><input id="button_source_id332" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id332');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id339" style="display:block">
+                           <div id="source_id332" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -53130,7 +52461,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id341"></a><div class="componentTitle">Attribute Group <span class="qname">k.description.attribute</span></div>
+      </table><a id="id334"></a><div class="componentTitle">Attribute Group <span class="qname">k.description.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -53149,25 +52480,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id341" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id341');"
+                           <div class="floatRight"><input id="button_diagram_id334" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id334');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id341" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html81.jpeg" usemap="#kiwi_46_html81" /><map name="kiwi_46_html81" id="kiwi_46_html81">
-                                 <area alt="kiwi0.tmp#id342" href="kiwi0.html#id342" coords="202,1,300,25" /></map></div>
+                           <div id="diagram_id334" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html19.jpeg" usemap="#kiwi_46_html19" /><map name="kiwi_46_html19" id="kiwi_46_html19">
+                                 <area alt="kiwi0.tmp#id335" href="kiwi0.html#id335" coords="202,1,300,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id341" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id334" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id341');"
+                                     onclick="switchState('attributes_id334');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id341" style="display:block">
+                           <div id="attributes_id334" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -53180,7 +52511,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id342" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id335" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -53204,12 +52535,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id341" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id341');"
+                           <div class="floatRight"><input id="button_source_id334" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id334');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id341" style="display:block">
+                           <div id="source_id334" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -53235,7 +52566,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id343"></a><div class="componentTitle">Attribute Group <span class="qname">k.profiles.attribute</span></div>
+      </table><a id="id336"></a><div class="componentTitle">Attribute Group <span class="qname">k.profiles.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -53254,31 +52585,30 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id343" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id343');"
+                           <div class="floatRight"><input id="button_diagram_id336" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id336');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id343" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html111.jpeg"
-                                   usemap="#kiwi_46_html111" /><map name="kiwi_46_html111" id="kiwi_46_html111">
-                                 <area alt="kiwi0.tmp#id344" href="kiwi0.html#id344" coords="182,1,260,25" /></map></div>
+                           <div id="diagram_id336" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html9.jpeg" usemap="#kiwi_46_html9" /><map name="kiwi_46_html9" id="kiwi_46_html9">
+                                 <area alt="kiwi0.tmp#id337" href="kiwi0.html#id337" coords="182,1,260,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id343" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id343');"
+                           <div class="floatRight"><input id="button_usedBy_id336" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id336');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id343" style="display:block">
+                           <div id="usedBy_id336" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Groups </td>
-                                    <td><b><a href="kiwi0.html#id458" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.profiles.attribute</a></b>, <b><a href="kiwi0.html#id477" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.preferences.profiles.attribute</a></b>, <b><a href="kiwi0.html#id385" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id461" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.profiles.attribute</a></b>, <b><a href="kiwi0.html#id478" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.preferences.profiles.attribute</a></b>, <b><a href="kiwi0.html#id378" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.profiles.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -53288,13 +52618,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id343" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id336" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id343');"
+                                     onclick="switchState('attributes_id336');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id343" style="display:block">
+                           <div id="attributes_id336" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -53307,7 +52637,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id344" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id337" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -53331,12 +52661,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id343" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id343');"
+                           <div class="floatRight"><input id="button_source_id336" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id336');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id343" style="display:block">
+                           <div id="source_id336" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -53362,7 +52692,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id345"></a><div class="componentTitle">Attribute Group <span class="qname">k.size.attribute</span></div>
+      </table><a id="id338"></a><div class="componentTitle">Attribute Group <span class="qname">k.size.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -53381,29 +52711,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id345" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id345');"
+                           <div class="floatRight"><input id="button_diagram_id338" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id338');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id345" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html206.jpeg"
-                                   usemap="#kiwi_46_html206" /><map name="kiwi_46_html206" id="kiwi_46_html206">
-                                 <area alt="kiwi0.tmp#id346" href="kiwi0.html#id346" coords="162,0,277,42" /></map></div>
+                           <div id="diagram_id338" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html107.jpeg"
+                                   usemap="#kiwi_46_html107" /><map name="kiwi_46_html107" id="kiwi_46_html107">
+                                 <area alt="kiwi0.tmp#id339" href="kiwi0.html#id339" coords="162,0,277,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id345" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id345');"
+                           <div class="floatRight"><input id="button_usedBy_id338" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id338');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id345" style="display:block">
+                           <div id="usedBy_id338" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id378" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id371" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.size.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -53413,13 +52743,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id345" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id338" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id345');"
+                                     onclick="switchState('attributes_id338');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id345" style="display:block">
+                           <div id="attributes_id338" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -53432,7 +52762,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id346" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id339" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b></td>
                                     <td><b><a href="kiwi0.html#id2" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size-type</a></b></td>
@@ -53457,12 +52787,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id345" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id345');"
+                           <div class="floatRight"><input id="button_source_id338" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id338');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id345" style="display:block">
+                           <div id="source_id338" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -53488,7 +52818,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id347"></a><div class="componentTitle">Attribute Group <span class="qname">k.username.attribute</span></div>
+      </table><a id="id340"></a><div class="componentTitle">Attribute Group <span class="qname">k.username.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -53507,29 +52837,29 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id347" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id347');"
+                           <div class="floatRight"><input id="button_diagram_id340" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id340');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id347" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html105.jpeg"
-                                   usemap="#kiwi_46_html105" /><map name="kiwi_46_html105" id="kiwi_46_html105">
-                                 <area alt="kiwi0.tmp#id348" href="kiwi0.html#id348" coords="194,1,284,25" /></map></div>
+                           <div id="diagram_id340" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html119.jpeg"
+                                   usemap="#kiwi_46_html119" /><map name="kiwi_46_html119" id="kiwi_46_html119">
+                                 <area alt="kiwi0.tmp#id341" href="kiwi0.html#id341" coords="194,1,284,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id347" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id347');"
+                           <div class="floatRight"><input id="button_usedBy_id340" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id340');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id347" style="display:block">
+                           <div id="usedBy_id340" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Group </td>
-                                    <td><b><a href="kiwi0.html#id351" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id344" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.username.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -53539,13 +52869,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id347" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id340" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id347');"
+                                     onclick="switchState('attributes_id340');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id347" style="display:block">
+                           <div id="attributes_id340" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -53558,7 +52888,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id348" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id341" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">username</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -53582,12 +52912,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id347" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id347');"
+                           <div class="floatRight"><input id="button_source_id340" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id340');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id347" style="display:block">
+                           <div id="source_id340" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -53613,7 +52943,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id349"></a><div class="componentTitle">Attribute Group <span class="qname">k.configuration.arch.attribute</span></div>
+      </table><a id="id342"></a><div class="componentTitle">Attribute Group <span class="qname">k.configuration.arch.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -53632,27 +52962,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id349" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id349');"
+                           <div class="floatRight"><input id="button_diagram_id342" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id342');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id349" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html221.jpeg"
-                                   usemap="#kiwi_46_html221" /><map name="kiwi_46_html221" id="kiwi_46_html221">
-                                 <area alt="kiwi0.tmp#id340" href="kiwi0.html#id340" coords="255,44,316,68" />
-                                 <area alt="kiwi0.tmp#id339" href="kiwi0.html#id339" coords="244,3,381,29" /></map></div>
+                           <div id="diagram_id342" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html166.jpeg"
+                                   usemap="#kiwi_46_html166" /><map name="kiwi_46_html166" id="kiwi_46_html166">
+                                 <area alt="kiwi0.tmp#id333" href="kiwi0.html#id333" coords="255,44,316,68" />
+                                 <area alt="kiwi0.tmp#id332" href="kiwi0.html#id332" coords="244,3,381,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id349" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id342" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id349');"
+                                     onclick="switchState('attributes_id342');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id349" style="display:block">
+                           <div id="attributes_id342" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -53665,7 +52995,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id340" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id333" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -53689,12 +53019,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id349" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id349');"
+                           <div class="floatRight"><input id="button_source_id342" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id342');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id349" style="display:block">
+                           <div id="source_id342" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -53716,7 +53046,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id350"></a><div class="componentTitle">Attribute Group <span class="qname">k.file.arch.attribute</span></div>
+      </table><a id="id343"></a><div class="componentTitle">Attribute Group <span class="qname">k.file.arch.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -53735,26 +53065,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id350" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id350');"
+                           <div class="floatRight"><input id="button_diagram_id343" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id343');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id350" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html95.jpeg" usemap="#kiwi_46_html95" /><map name="kiwi_46_html95" id="kiwi_46_html95">
-                                 <area alt="kiwi0.tmp#id340" href="kiwi0.html#id340" coords="198,44,259,68" />
-                                 <area alt="kiwi0.tmp#id339" href="kiwi0.html#id339" coords="187,3,324,29" /></map></div>
+                           <div id="diagram_id343" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html0.jpeg" usemap="#kiwi_46_html0" /><map name="kiwi_46_html0" id="kiwi_46_html0">
+                                 <area alt="kiwi0.tmp#id333" href="kiwi0.html#id333" coords="198,44,259,68" />
+                                 <area alt="kiwi0.tmp#id332" href="kiwi0.html#id332" coords="187,3,324,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id350" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id343" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id350');"
+                                     onclick="switchState('attributes_id343');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id350" style="display:block">
+                           <div id="attributes_id343" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -53767,7 +53097,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id340" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id333" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -53791,12 +53121,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id350" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id350');"
+                           <div class="floatRight"><input id="button_source_id343" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id343');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id350" style="display:block">
+                           <div id="source_id343" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -53818,7 +53148,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id351"></a><div class="componentTitle">Attribute Group <span class="qname">k.instrepo.username.attribute</span></div>
+      </table><a id="id344"></a><div class="componentTitle">Attribute Group <span class="qname">k.instrepo.username.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -53837,27 +53167,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id351" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id351');"
+                           <div class="floatRight"><input id="button_diagram_id344" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id344');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id351" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html141.jpeg"
-                                   usemap="#kiwi_46_html141" /><map name="kiwi_46_html141" id="kiwi_46_html141">
-                                 <area alt="kiwi0.tmp#id348" href="kiwi0.html#id348" coords="256,44,346,68" />
-                                 <area alt="kiwi0.tmp#id347" href="kiwi0.html#id347" coords="245,3,411,29" /></map></div>
+                           <div id="diagram_id344" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html271.jpeg"
+                                   usemap="#kiwi_46_html271" /><map name="kiwi_46_html271" id="kiwi_46_html271">
+                                 <area alt="kiwi0.tmp#id341" href="kiwi0.html#id341" coords="256,44,346,68" />
+                                 <area alt="kiwi0.tmp#id340" href="kiwi0.html#id340" coords="245,3,411,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id351" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id344" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id351');"
+                                     onclick="switchState('attributes_id344');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id351" style="display:block">
+                           <div id="attributes_id344" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -53870,7 +53200,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id348" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id341" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">username</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -53894,12 +53224,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id351" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id351');"
+                           <div class="floatRight"><input id="button_source_id344" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id344');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id351" style="display:block">
+                           <div id="source_id344" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -53921,7 +53251,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id352"></a><div class="componentTitle">Attribute Group <span class="qname">k.instrepo.pwd.attribute</span></div>
+      </table><a id="id345"></a><div class="componentTitle">Attribute Group <span class="qname">k.instrepo.pwd.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -53940,27 +53270,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id352" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id352');"
+                           <div class="floatRight"><input id="button_diagram_id345" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id345');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id352" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html201.jpeg"
-                                   usemap="#kiwi_46_html201" /><map name="kiwi_46_html201" id="kiwi_46_html201">
-                                 <area alt="kiwi0.tmp#id279" href="kiwi0.html#id279" coords="225,44,286,68" />
-                                 <area alt="kiwi0.tmp#id278" href="kiwi0.html#id278" coords="214,3,349,29" /></map></div>
+                           <div id="diagram_id345" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html259.jpeg"
+                                   usemap="#kiwi_46_html259" /><map name="kiwi_46_html259" id="kiwi_46_html259">
+                                 <area alt="kiwi0.tmp#id272" href="kiwi0.html#id272" coords="225,44,286,68" />
+                                 <area alt="kiwi0.tmp#id271" href="kiwi0.html#id271" coords="214,3,349,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id352" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id345" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id352');"
+                                     onclick="switchState('attributes_id345');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id352" style="display:block">
+                           <div id="attributes_id345" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -53973,7 +53303,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id279" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id272" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pwd</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -53997,12 +53327,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id352" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id352');"
+                           <div class="floatRight"><input id="button_source_id345" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id345');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id352" style="display:block">
+                           <div id="source_id345" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -54024,7 +53354,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id353"></a><div class="componentTitle">Attribute Group <span class="qname">k.instrepo.local.attribute</span></div>
+      </table><a id="id346"></a><div class="componentTitle">Attribute Group <span class="qname">k.instrepo.local.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -54043,26 +53373,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id353" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id353');"
+                           <div class="floatRight"><input id="button_diagram_id346" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id346');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id353" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html127.jpeg"
-                                   usemap="#kiwi_46_html127" /><map name="kiwi_46_html127" id="kiwi_46_html127">
-                                 <area alt="kiwi0.tmp#id354" href="kiwi0.html#id354" coords="214,0,338,42" /></map></div>
+                           <div id="diagram_id346" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html88.jpeg" usemap="#kiwi_46_html88" /><map name="kiwi_46_html88" id="kiwi_46_html88">
+                                 <area alt="kiwi0.tmp#id347" href="kiwi0.html#id347" coords="214,0,338,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id353" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id346" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id353');"
+                                     onclick="switchState('attributes_id346');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id353" style="display:block">
+                           <div id="attributes_id346" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -54075,7 +53404,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id354" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id347" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">local</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -54092,12 +53421,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id353" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id353');"
+                           <div class="floatRight"><input id="button_source_id346" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id346');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id353" style="display:block">
+                           <div id="source_id346" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -54119,7 +53448,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id355"></a><div class="componentTitle">Attribute Group <span class="qname">k.opensusepattern.arch.attribute</span></div>
+      </table><a id="id348"></a><div class="componentTitle">Attribute Group <span class="qname">k.opensusepattern.arch.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -54138,26 +53467,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id355" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id355');"
+                           <div class="floatRight"><input id="button_diagram_id348" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id348');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id355" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html4.jpeg" usemap="#kiwi_46_html4" /><map name="kiwi_46_html4" id="kiwi_46_html4">
-                                 <area alt="kiwi0.tmp#id340" href="kiwi0.html#id340" coords="273,44,334,68" />
-                                 <area alt="kiwi0.tmp#id339" href="kiwi0.html#id339" coords="262,3,399,29" /></map></div>
+                           <div id="diagram_id348" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html267.jpeg"
+                                   usemap="#kiwi_46_html267" /><map name="kiwi_46_html267" id="kiwi_46_html267">
+                                 <area alt="kiwi0.tmp#id333" href="kiwi0.html#id333" coords="273,44,334,68" />
+                                 <area alt="kiwi0.tmp#id332" href="kiwi0.html#id332" coords="262,3,399,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id355" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id348" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id355');"
+                                     onclick="switchState('attributes_id348');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id355" style="display:block">
+                           <div id="attributes_id348" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -54170,7 +53500,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id340" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id333" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -54194,12 +53524,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id355" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id355');"
+                           <div class="floatRight"><input id="button_source_id348" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id348');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id355" style="display:block">
+                           <div id="source_id348" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -54221,7 +53551,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id356"></a><div class="componentTitle">Attribute Group <span class="qname">k.rhelgroup.arch.attribute</span></div>
+      </table><a id="id349"></a><div class="componentTitle">Attribute Group <span class="qname">k.rhelgroup.arch.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -54240,27 +53570,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id356" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id356');"
+                           <div class="floatRight"><input id="button_diagram_id349" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id349');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id356" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html139.jpeg"
-                                   usemap="#kiwi_46_html139" /><map name="kiwi_46_html139" id="kiwi_46_html139">
-                                 <area alt="kiwi0.tmp#id340" href="kiwi0.html#id340" coords="236,44,297,68" />
-                                 <area alt="kiwi0.tmp#id339" href="kiwi0.html#id339" coords="225,3,362,29" /></map></div>
+                           <div id="diagram_id349" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html278.jpeg"
+                                   usemap="#kiwi_46_html278" /><map name="kiwi_46_html278" id="kiwi_46_html278">
+                                 <area alt="kiwi0.tmp#id333" href="kiwi0.html#id333" coords="236,44,297,68" />
+                                 <area alt="kiwi0.tmp#id332" href="kiwi0.html#id332" coords="225,3,362,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id356" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id349" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id356');"
+                                     onclick="switchState('attributes_id349');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id356" style="display:block">
+                           <div id="attributes_id349" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -54273,7 +53603,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id340" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id333" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -54297,12 +53627,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id356" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id356');"
+                           <div class="floatRight"><input id="button_source_id349" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id349');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id356" style="display:block">
+                           <div id="source_id349" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -54324,7 +53654,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id357"></a><div class="componentTitle">Attribute Group <span class="qname">k.opensuseproduct.arch.attribute</span></div>
+      </table><a id="id350"></a><div class="componentTitle">Attribute Group <span class="qname">k.opensuseproduct.arch.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -54343,27 +53673,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id357" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id357');"
+                           <div class="floatRight"><input id="button_diagram_id350" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id350');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id357" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html285.jpeg"
-                                   usemap="#kiwi_46_html285" /><map name="kiwi_46_html285" id="kiwi_46_html285">
-                                 <area alt="kiwi0.tmp#id340" href="kiwi0.html#id340" coords="277,44,338,68" />
-                                 <area alt="kiwi0.tmp#id339" href="kiwi0.html#id339" coords="266,3,403,29" /></map></div>
+                           <div id="diagram_id350" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html11.jpeg" usemap="#kiwi_46_html11" /><map name="kiwi_46_html11" id="kiwi_46_html11">
+                                 <area alt="kiwi0.tmp#id333" href="kiwi0.html#id333" coords="277,44,338,68" />
+                                 <area alt="kiwi0.tmp#id332" href="kiwi0.html#id332" coords="266,3,403,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id357" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id350" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id357');"
+                                     onclick="switchState('attributes_id350');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id357" style="display:block">
+                           <div id="attributes_id350" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -54376,7 +53705,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id340" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id333" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -54400,12 +53729,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id357" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id357');"
+                           <div class="floatRight"><input id="button_source_id350" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id350');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id357" style="display:block">
+                           <div id="source_id350" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -54427,7 +53756,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id358"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.arch.attribute</span></div>
+      </table><a id="id351"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.arch.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -54446,27 +53775,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id358" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id358');"
+                           <div class="floatRight"><input id="button_diagram_id351" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id351');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id358" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html130.jpeg"
-                                   usemap="#kiwi_46_html130" /><map name="kiwi_46_html130" id="kiwi_46_html130">
-                                 <area alt="kiwi0.tmp#id340" href="kiwi0.html#id340" coords="251,44,312,68" />
-                                 <area alt="kiwi0.tmp#id339" href="kiwi0.html#id339" coords="240,3,377,29" /></map></div>
+                           <div id="diagram_id351" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html170.jpeg"
+                                   usemap="#kiwi_46_html170" /><map name="kiwi_46_html170" id="kiwi_46_html170">
+                                 <area alt="kiwi0.tmp#id333" href="kiwi0.html#id333" coords="251,44,312,68" />
+                                 <area alt="kiwi0.tmp#id332" href="kiwi0.html#id332" coords="240,3,377,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id358" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id351" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id358');"
+                                     onclick="switchState('attributes_id351');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id358" style="display:block">
+                           <div id="attributes_id351" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -54479,7 +53808,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id340" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id333" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -54503,12 +53832,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id358" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id358');"
+                           <div class="floatRight"><input id="button_source_id351" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id351');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id358" style="display:block">
+                           <div id="source_id351" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -54530,7 +53859,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id359"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.forcerepo.attribute</span></div>
+      </table><a id="id352"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.forcerepo.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -54549,26 +53878,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id359" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id359');"
+                           <div class="floatRight"><input id="button_diagram_id352" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id352');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id359" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html255.jpeg"
-                                   usemap="#kiwi_46_html255" /><map name="kiwi_46_html255" id="kiwi_46_html255">
-                                 <area alt="kiwi0.tmp#id360" href="kiwi0.html#id360" coords="266,0,377,42" /></map></div>
+                           <div id="diagram_id352" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html121.jpeg"
+                                   usemap="#kiwi_46_html121" /><map name="kiwi_46_html121" id="kiwi_46_html121">
+                                 <area alt="kiwi0.tmp#id353" href="kiwi0.html#id353" coords="266,0,377,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id359" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id352" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id359');"
+                                     onclick="switchState('attributes_id352');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id359" style="display:block">
+                           <div id="attributes_id352" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -54581,7 +53910,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id360" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id353" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">forcerepo</a></b></td>
                                     <td><b>xs:IDREF</b></td>
                                     <td></td>
@@ -54605,12 +53934,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id359" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id359');"
+                           <div class="floatRight"><input id="button_source_id352" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id352');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id359" style="display:block">
+                           <div id="source_id352" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -54636,7 +53965,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id361"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.addarch.attribute</span></div>
+      </table><a id="id354"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.addarch.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -54655,26 +53984,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id361" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id361');"
+                           <div class="floatRight"><input id="button_diagram_id354" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id354');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id361" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html146.jpeg"
-                                   usemap="#kiwi_46_html146" /><map name="kiwi_46_html146" id="kiwi_46_html146">
-                                 <area alt="kiwi0.tmp#id362" href="kiwi0.html#id362" coords="257,1,338,25" /></map></div>
+                           <div id="diagram_id354" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html64.jpeg" usemap="#kiwi_46_html64" /><map name="kiwi_46_html64" id="kiwi_46_html64">
+                                 <area alt="kiwi0.tmp#id355" href="kiwi0.html#id355" coords="257,1,338,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id361" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id354" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id361');"
+                                     onclick="switchState('attributes_id354');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id361" style="display:block">
+                           <div id="attributes_id354" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -54687,7 +54015,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id362" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id355" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">addarch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -54704,12 +54032,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id361" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id361');"
+                           <div class="floatRight"><input id="button_source_id354" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id354');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id361" style="display:block">
+                           <div id="source_id354" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -54731,7 +54059,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id363"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.removearch.attribute</span></div>
+      </table><a id="id356"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.removearch.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -54750,26 +54078,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id363" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id363');"
+                           <div class="floatRight"><input id="button_diagram_id356" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id356');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id363" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html107.jpeg"
-                                   usemap="#kiwi_46_html107" /><map name="kiwi_46_html107" id="kiwi_46_html107">
-                                 <area alt="kiwi0.tmp#id364" href="kiwi0.html#id364" coords="277,1,378,25" /></map></div>
+                           <div id="diagram_id356" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html153.jpeg"
+                                   usemap="#kiwi_46_html153" /><map name="kiwi_46_html153" id="kiwi_46_html153">
+                                 <area alt="kiwi0.tmp#id357" href="kiwi0.html#id357" coords="277,1,378,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id363" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id356" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id363');"
+                                     onclick="switchState('attributes_id356');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id363" style="display:block">
+                           <div id="attributes_id356" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -54782,7 +54110,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id364" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id357" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">removearch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -54799,12 +54127,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id363" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id363');"
+                           <div class="floatRight"><input id="button_source_id356" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id356');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id363" style="display:block">
+                           <div id="source_id356" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -54826,7 +54154,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id365"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.onlyarch.attribute</span></div>
+      </table><a id="id358"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.onlyarch.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -54845,25 +54173,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id365" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id365');"
+                           <div class="floatRight"><input id="button_diagram_id358" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id358');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id365" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html57.jpeg" usemap="#kiwi_46_html57" /><map name="kiwi_46_html57" id="kiwi_46_html57">
-                                 <area alt="kiwi0.tmp#id366" href="kiwi0.html#id366" coords="260,1,344,25" /></map></div>
+                           <div id="diagram_id358" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html212.jpeg"
+                                   usemap="#kiwi_46_html212" /><map name="kiwi_46_html212" id="kiwi_46_html212">
+                                 <area alt="kiwi0.tmp#id359" href="kiwi0.html#id359" coords="260,1,344,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id365" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id358" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id365');"
+                                     onclick="switchState('attributes_id358');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id365" style="display:block">
+                           <div id="attributes_id358" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -54876,7 +54205,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id366" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id359" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">onlyarch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -54893,12 +54222,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id365" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id365');"
+                           <div class="floatRight"><input id="button_source_id358" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id358');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id365" style="display:block">
+                           <div id="source_id358" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -54920,7 +54249,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id367"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.medium.attribute</span></div>
+      </table><a id="id360"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.medium.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -54939,26 +54268,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id367" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id367');"
+                           <div class="floatRight"><input id="button_diagram_id360" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id360');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id367" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html154.jpeg"
-                                   usemap="#kiwi_46_html154" /><map name="kiwi_46_html154" id="kiwi_46_html154">
-                                 <area alt="kiwi0.tmp#id368" href="kiwi0.html#id368" coords="256,0,442,42" /></map></div>
+                           <div id="diagram_id360" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html43.jpeg" usemap="#kiwi_46_html43" /><map name="kiwi_46_html43" id="kiwi_46_html43">
+                                 <area alt="kiwi0.tmp#id361" href="kiwi0.html#id361" coords="256,0,442,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id367" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id360" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id367');"
+                                     onclick="switchState('attributes_id360');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id367" style="display:block">
+                           <div id="attributes_id360" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -54971,7 +54299,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id368" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id361" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">medium</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -54988,12 +54316,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id367" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id367');"
+                           <div class="floatRight"><input id="button_source_id360" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id360');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id367" style="display:block">
+                           <div id="source_id360" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -55015,7 +54343,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id369"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.source.attribute</span></div>
+      </table><a id="id362"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.source.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -55034,26 +54362,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id369" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id369');"
+                           <div class="floatRight"><input id="button_diagram_id362" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id362');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id369" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html59.jpeg" usemap="#kiwi_46_html59" /><map name="kiwi_46_html59" id="kiwi_46_html59">
-                                 <area alt="kiwi0.tmp#id99" href="kiwi0.html#id99" coords="264,44,338,68" />
-                                 <area alt="kiwi0.tmp#id98" href="kiwi0.html#id98" coords="253,3,403,29" /></map></div>
+                           <div id="diagram_id362" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html264.jpeg"
+                                   usemap="#kiwi_46_html264" /><map name="kiwi_46_html264" id="kiwi_46_html264">
+                                 <area alt="kiwi0.tmp#id102" href="kiwi0.html#id102" coords="264,44,338,68" />
+                                 <area alt="kiwi0.tmp#id101" href="kiwi0.html#id101" coords="253,3,403,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id369" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id362" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id369');"
+                                     onclick="switchState('attributes_id362');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id369" style="display:block">
+                           <div id="attributes_id362" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -55066,7 +54395,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id99" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id102" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -55083,12 +54412,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id369" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id369');"
+                           <div class="floatRight"><input id="button_source_id362" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id362');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id369" style="display:block">
+                           <div id="source_id362" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -55110,7 +54439,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id370"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.script.attribute</span></div>
+      </table><a id="id363"></a><div class="componentTitle">Attribute Group <span class="qname">k.repopackage.script.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -55129,26 +54458,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id370" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id370');"
+                           <div class="floatRight"><input id="button_diagram_id363" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id363');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id370" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html16.jpeg" usemap="#kiwi_46_html16" /><map name="kiwi_46_html16" id="kiwi_46_html16">
-                                 <area alt="kiwi0.tmp#id264" href="kiwi0.html#id264" coords="258,44,326,68" />
-                                 <area alt="kiwi0.tmp#id263" href="kiwi0.html#id263" coords="247,3,391,29" /></map></div>
+                           <div id="diagram_id363" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html165.jpeg"
+                                   usemap="#kiwi_46_html165" /><map name="kiwi_46_html165" id="kiwi_46_html165">
+                                 <area alt="kiwi0.tmp#id257" href="kiwi0.html#id257" coords="258,44,326,68" />
+                                 <area alt="kiwi0.tmp#id256" href="kiwi0.html#id256" coords="247,3,391,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id370" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id363" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id370');"
+                                     onclick="switchState('attributes_id363');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id370" style="display:block">
+                           <div id="attributes_id363" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -55161,7 +54491,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id264" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id257" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">script</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -55178,12 +54508,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id370" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id370');"
+                           <div class="floatRight"><input id="button_source_id363" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id363');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id370" style="display:block">
+                           <div id="source_id363" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -55205,7 +54535,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id371"></a><div class="componentTitle">Attribute Group <span class="qname">k.package.arch.attribute</span></div>
+      </table><a id="id364"></a><div class="componentTitle">Attribute Group <span class="qname">k.package.arch.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -55224,27 +54554,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id371" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id371');"
+                           <div class="floatRight"><input id="button_diagram_id364" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id364');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id371" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html126.jpeg"
-                                   usemap="#kiwi_46_html126" /><map name="kiwi_46_html126" id="kiwi_46_html126">
-                                 <area alt="kiwi0.tmp#id340" href="kiwi0.html#id340" coords="226,44,287,68" />
-                                 <area alt="kiwi0.tmp#id339" href="kiwi0.html#id339" coords="215,3,352,29" /></map></div>
+                           <div id="diagram_id364" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html132.jpeg"
+                                   usemap="#kiwi_46_html132" /><map name="kiwi_46_html132" id="kiwi_46_html132">
+                                 <area alt="kiwi0.tmp#id333" href="kiwi0.html#id333" coords="226,44,287,68" />
+                                 <area alt="kiwi0.tmp#id332" href="kiwi0.html#id332" coords="215,3,352,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id371" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id364" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id371');"
+                                     onclick="switchState('attributes_id364');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id371" style="display:block">
+                           <div id="attributes_id364" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -55257,7 +54587,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id340" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id333" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -55281,12 +54611,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id371" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id371');"
+                           <div class="floatRight"><input id="button_source_id364" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id364');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id371" style="display:block">
+                           <div id="source_id364" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -55308,7 +54638,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id372"></a><div class="componentTitle">Attribute Group <span class="qname">k.package.replaces.attribute</span></div>
+      </table><a id="id365"></a><div class="componentTitle">Attribute Group <span class="qname">k.package.replaces.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -55327,27 +54657,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id372" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id372');"
+                           <div class="floatRight"><input id="button_diagram_id365" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id365');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id372" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html191.jpeg"
-                                   usemap="#kiwi_46_html191" /><map name="kiwi_46_html191" id="kiwi_46_html191">
-                                 <area alt="kiwi0.tmp#id334" href="kiwi0.html#id334" coords="247,44,329,68" />
-                                 <area alt="kiwi0.tmp#id333" href="kiwi0.html#id333" coords="236,3,394,29" /></map></div>
+                           <div id="diagram_id365" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html155.jpeg"
+                                   usemap="#kiwi_46_html155" /><map name="kiwi_46_html155" id="kiwi_46_html155">
+                                 <area alt="kiwi0.tmp#id327" href="kiwi0.html#id327" coords="247,44,329,68" />
+                                 <area alt="kiwi0.tmp#id326" href="kiwi0.html#id326" coords="236,3,394,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id372" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id365" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id372');"
+                                     onclick="switchState('attributes_id365');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id372" style="display:block">
+                           <div id="attributes_id365" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -55360,7 +54690,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id334" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id327" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">replaces</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -55384,12 +54714,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id372" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id372');"
+                           <div class="floatRight"><input id="button_source_id365" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id365');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id372" style="display:block">
+                           <div id="source_id365" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -55411,7 +54741,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id373"></a><div class="componentTitle">Attribute Group <span class="qname">k.package.bootinclude.attribute</span></div>
+      </table><a id="id366"></a><div class="componentTitle">Attribute Group <span class="qname">k.package.bootinclude.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -55430,27 +54760,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id373" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id373');"
+                           <div class="floatRight"><input id="button_diagram_id366" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id366');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id373" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html269.jpeg"
-                                   usemap="#kiwi_46_html269" /><map name="kiwi_46_html269" id="kiwi_46_html269">
-                                 <area alt="kiwi0.tmp#id336" href="kiwi0.html#id336" coords="266,44,390,86" />
-                                 <area alt="kiwi0.tmp#id335" href="kiwi0.html#id335" coords="255,3,432,29" /></map></div>
+                           <div id="diagram_id366" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html67.jpeg" usemap="#kiwi_46_html67" /><map name="kiwi_46_html67" id="kiwi_46_html67">
+                                 <area alt="kiwi0.tmp#id329" href="kiwi0.html#id329" coords="266,44,390,86" />
+                                 <area alt="kiwi0.tmp#id328" href="kiwi0.html#id328" coords="255,3,432,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id373" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id366" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id373');"
+                                     onclick="switchState('attributes_id366');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id373" style="display:block">
+                           <div id="attributes_id366" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -55463,7 +54792,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id336" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id329" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootinclude</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -55480,12 +54809,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id373" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id373');"
+                           <div class="floatRight"><input id="button_source_id366" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id366');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id373" style="display:block">
+                           <div id="source_id366" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -55507,7 +54836,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id374"></a><div class="componentTitle">Attribute Group <span class="qname">k.package.bootdelete.attribute</span></div>
+      </table><a id="id367"></a><div class="componentTitle">Attribute Group <span class="qname">k.package.bootdelete.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -55526,27 +54855,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id374" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id374');"
+                           <div class="floatRight"><input id="button_diagram_id367" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id367');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id374" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html152.jpeg"
-                                   usemap="#kiwi_46_html152" /><map name="kiwi_46_html152" id="kiwi_46_html152">
-                                 <area alt="kiwi0.tmp#id338" href="kiwi0.html#id338" coords="259,44,383,86" />
-                                 <area alt="kiwi0.tmp#id337" href="kiwi0.html#id337" coords="248,3,418,29" /></map></div>
+                           <div id="diagram_id367" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html20.jpeg" usemap="#kiwi_46_html20" /><map name="kiwi_46_html20" id="kiwi_46_html20">
+                                 <area alt="kiwi0.tmp#id331" href="kiwi0.html#id331" coords="259,44,383,86" />
+                                 <area alt="kiwi0.tmp#id330" href="kiwi0.html#id330" coords="248,3,418,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id374" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id367" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id374');"
+                                     onclick="switchState('attributes_id367');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id374" style="display:block">
+                           <div id="attributes_id367" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -55559,7 +54887,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id338" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id331" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootdelete</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -55576,12 +54904,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id374" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id374');"
+                           <div class="floatRight"><input id="button_source_id367" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id367');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id374" style="display:block">
+                           <div id="source_id367" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -55603,7 +54931,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id375"></a><div class="componentTitle">Attribute Group <span class="qname">k.archive.bootinclude.attribute</span></div>
+      </table><a id="id368"></a><div class="componentTitle">Attribute Group <span class="qname">k.archive.bootinclude.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -55622,27 +54950,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id375" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id375');"
+                           <div class="floatRight"><input id="button_diagram_id368" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id368');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id375" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html200.jpeg"
-                                   usemap="#kiwi_46_html200" /><map name="kiwi_46_html200" id="kiwi_46_html200">
-                                 <area alt="kiwi0.tmp#id336" href="kiwi0.html#id336" coords="261,44,385,86" />
-                                 <area alt="kiwi0.tmp#id335" href="kiwi0.html#id335" coords="250,3,427,29" /></map></div>
+                           <div id="diagram_id368" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html197.jpeg"
+                                   usemap="#kiwi_46_html197" /><map name="kiwi_46_html197" id="kiwi_46_html197">
+                                 <area alt="kiwi0.tmp#id329" href="kiwi0.html#id329" coords="261,44,385,86" />
+                                 <area alt="kiwi0.tmp#id328" href="kiwi0.html#id328" coords="250,3,427,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id375" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id368" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id375');"
+                                     onclick="switchState('attributes_id368');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id375" style="display:block">
+                           <div id="attributes_id368" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -55655,7 +54983,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id336" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id329" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootinclude</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -55672,12 +55000,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id375" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id375');"
+                           <div class="floatRight"><input id="button_source_id368" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id368');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id375" style="display:block">
+                           <div id="source_id368" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -55699,7 +55027,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id376"></a><div class="componentTitle">Attribute Group <span class="qname">k.partitions.device.attribute</span></div>
+      </table><a id="id369"></a><div class="componentTitle">Attribute Group <span class="qname">k.partitions.device.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -55718,25 +55046,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id376" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id376');"
+                           <div class="floatRight"><input id="button_diagram_id369" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id369');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id376" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html74.jpeg" usemap="#kiwi_46_html74" /><map name="kiwi_46_html74" id="kiwi_46_html74">
-                                 <area alt="kiwi0.tmp#id377" href="kiwi0.html#id377" coords="230,1,301,25" /></map></div>
+                           <div id="diagram_id369" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html275.jpeg"
+                                   usemap="#kiwi_46_html275" /><map name="kiwi_46_html275" id="kiwi_46_html275">
+                                 <area alt="kiwi0.tmp#id370" href="kiwi0.html#id370" coords="230,1,301,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id376" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id369" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id376');"
+                                     onclick="switchState('attributes_id369');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id376" style="display:block">
+                           <div id="attributes_id369" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -55749,7 +55078,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id377" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id370" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">device</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -55766,12 +55095,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id376" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id376');"
+                           <div class="floatRight"><input id="button_source_id369" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id369');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id376" style="display:block">
+                           <div id="source_id369" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -55793,7 +55122,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id378"></a><div class="componentTitle">Attribute Group <span class="qname">k.partition.size.attribute</span></div>
+      </table><a id="id371"></a><div class="componentTitle">Attribute Group <span class="qname">k.partition.size.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -55812,27 +55141,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id378" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id378');"
+                           <div class="floatRight"><input id="button_diagram_id371" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id371');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id378" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html203.jpeg"
-                                   usemap="#kiwi_46_html203" /><map name="kiwi_46_html203" id="kiwi_46_html203">
-                                 <area alt="kiwi0.tmp#id346" href="kiwi0.html#id346" coords="225,44,340,86" />
-                                 <area alt="kiwi0.tmp#id345" href="kiwi0.html#id345" coords="214,3,348,29" /></map></div>
+                           <div id="diagram_id371" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html151.jpeg"
+                                   usemap="#kiwi_46_html151" /><map name="kiwi_46_html151" id="kiwi_46_html151">
+                                 <area alt="kiwi0.tmp#id339" href="kiwi0.html#id339" coords="225,44,340,86" />
+                                 <area alt="kiwi0.tmp#id338" href="kiwi0.html#id338" coords="214,3,348,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id378" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id371" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id378');"
+                                     onclick="switchState('attributes_id371');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id378" style="display:block">
+                           <div id="attributes_id371" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -55845,7 +55174,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id346" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id339" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b></td>
                                     <td><b><a href="kiwi0.html#id2" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size-type</a></b></td>
@@ -55870,12 +55199,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id378" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id378');"
+                           <div class="floatRight"><input id="button_source_id371" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id371');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id378" style="display:block">
+                           <div id="source_id371" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -55897,7 +55226,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id379"></a><div class="componentTitle">Attribute Group <span class="qname">k.partition.mountpoint.attribute</span></div>
+      </table><a id="id372"></a><div class="componentTitle">Attribute Group <span class="qname">k.partition.mountpoint.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -55916,25 +55245,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id379" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id379');"
+                           <div class="floatRight"><input id="button_diagram_id372" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id372');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id379" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html43.jpeg" usemap="#kiwi_46_html43" /><map name="kiwi_46_html43" id="kiwi_46_html43">
-                                 <area alt="kiwi0.tmp#id380" href="kiwi0.html#id380" coords="253,1,353,25" /></map></div>
+                           <div id="diagram_id372" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html270.jpeg"
+                                   usemap="#kiwi_46_html270" /><map name="kiwi_46_html270" id="kiwi_46_html270">
+                                 <area alt="kiwi0.tmp#id373" href="kiwi0.html#id373" coords="253,1,353,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id379" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id372" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id379');"
+                                     onclick="switchState('attributes_id372');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id379" style="display:block">
+                           <div id="attributes_id372" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -55947,7 +55277,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id380" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id373" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mountpoint</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -55971,12 +55301,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id379" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id379');"
+                           <div class="floatRight"><input id="button_source_id372" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id372');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id379" style="display:block">
+                           <div id="source_id372" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -56002,7 +55332,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id381"></a><div class="componentTitle">Attribute Group <span class="qname">k.partition.target.attribute</span></div>
+      </table><a id="id374"></a><div class="componentTitle">Attribute Group <span class="qname">k.partition.target.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -56021,25 +55351,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id381" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id381');"
+                           <div class="floatRight"><input id="button_diagram_id374" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id374');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id381" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html69.jpeg" usemap="#kiwi_46_html69" /><map name="kiwi_46_html69" id="kiwi_46_html69">
-                                 <area alt="kiwi0.tmp#id382" href="kiwi0.html#id382" coords="222,0,346,42" /></map></div>
+                           <div id="diagram_id374" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html113.jpeg"
+                                   usemap="#kiwi_46_html113" /><map name="kiwi_46_html113" id="kiwi_46_html113">
+                                 <area alt="kiwi0.tmp#id375" href="kiwi0.html#id375" coords="222,0,346,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id381" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id374" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id381');"
+                                     onclick="switchState('attributes_id374');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id381" style="display:block">
+                           <div id="attributes_id374" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -56052,7 +55383,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id382" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id375" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">target</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -56069,12 +55400,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id381" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id381');"
+                           <div class="floatRight"><input id="button_source_id374" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id374');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id381" style="display:block">
+                           <div id="source_id374" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -56096,7 +55427,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id383"></a><div class="componentTitle">Attribute Group <span class="qname">k.profile.import.attribute</span></div>
+      </table><a id="id376"></a><div class="componentTitle">Attribute Group <span class="qname">k.profile.import.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -56115,26 +55446,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id383" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id383');"
+                           <div class="floatRight"><input id="button_diagram_id376" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id376');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id383" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html222.jpeg"
-                                   usemap="#kiwi_46_html222" /><map name="kiwi_46_html222" id="kiwi_46_html222">
-                                 <area alt="kiwi0.tmp#id384" href="kiwi0.html#id384" coords="215,0,339,42" /></map></div>
+                           <div id="diagram_id376" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html218.jpeg"
+                                   usemap="#kiwi_46_html218" /><map name="kiwi_46_html218" id="kiwi_46_html218">
+                                 <area alt="kiwi0.tmp#id377" href="kiwi0.html#id377" coords="215,0,339,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id383" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id376" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id383');"
+                                     onclick="switchState('attributes_id376');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id383" style="display:block">
+                           <div id="attributes_id376" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -56147,7 +55478,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id384" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id377" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">import</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -56164,12 +55495,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id383" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id383');"
+                           <div class="floatRight"><input id="button_source_id376" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id376');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id383" style="display:block">
+                           <div id="source_id376" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -56191,7 +55522,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id385"></a><div class="componentTitle">Attribute Group <span class="qname">k.repository.profiles.attribute</span></div>
+      </table><a id="id378"></a><div class="componentTitle">Attribute Group <span class="qname">k.repository.profiles.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -56210,26 +55541,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id385" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id385');"
+                           <div class="floatRight"><input id="button_diagram_id378" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id378');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id385" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html40.jpeg" usemap="#kiwi_46_html40" /><map name="kiwi_46_html40" id="kiwi_46_html40">
-                                 <area alt="kiwi0.tmp#id344" href="kiwi0.html#id344" coords="255,44,333,68" />
-                                 <area alt="kiwi0.tmp#id343" href="kiwi0.html#id343" coords="244,3,398,29" /></map></div>
+                           <div id="diagram_id378" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html95.jpeg" usemap="#kiwi_46_html95" /><map name="kiwi_46_html95" id="kiwi_46_html95">
+                                 <area alt="kiwi0.tmp#id337" href="kiwi0.html#id337" coords="255,44,333,68" />
+                                 <area alt="kiwi0.tmp#id336" href="kiwi0.html#id336" coords="244,3,398,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id385" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id378" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id385');"
+                                     onclick="switchState('attributes_id378');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id385" style="display:block">
+                           <div id="attributes_id378" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -56242,7 +55573,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id344" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id337" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -56266,12 +55597,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id385" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id385');"
+                           <div class="floatRight"><input id="button_source_id378" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id378');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id385" style="display:block">
+                           <div id="source_id378" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -56293,7 +55624,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id386"></a><div class="componentTitle">Attribute Group <span class="qname">k.repository.status.attribute</span></div>
+      </table><a id="id379"></a><div class="componentTitle">Attribute Group <span class="qname">k.repository.status.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -56312,26 +55643,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id386" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id386');"
+                           <div class="floatRight"><input id="button_diagram_id379" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id379');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id386" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html234.jpeg"
-                                   usemap="#kiwi_46_html234" /><map name="kiwi_46_html234" id="kiwi_46_html234">
-                                 <area alt="kiwi0.tmp#id387" href="kiwi0.html#id387" coords="233,0,423,42" /></map></div>
+                           <div id="diagram_id379" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html59.jpeg" usemap="#kiwi_46_html59" /><map name="kiwi_46_html59" id="kiwi_46_html59">
+                                 <area alt="kiwi0.tmp#id380" href="kiwi0.html#id380" coords="233,0,423,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id386" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id379" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id386');"
+                                     onclick="switchState('attributes_id379');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id386" style="display:block">
+                           <div id="attributes_id379" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -56344,7 +55674,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id387" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id380" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">status</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -56361,12 +55691,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id386" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id386');"
+                           <div class="floatRight"><input id="button_source_id379" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id379');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id386" style="display:block">
+                           <div id="source_id379" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -56395,7 +55725,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id388"></a><div class="componentTitle">Attribute Group <span class="qname">k.repository.alias.attribute</span></div>
+      </table><a id="id381"></a><div class="componentTitle">Attribute Group <span class="qname">k.repository.alias.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -56414,25 +55744,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id388" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id388');"
+                           <div class="floatRight"><input id="button_diagram_id381" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id381');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id388" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html63.jpeg" usemap="#kiwi_46_html63" /><map name="kiwi_46_html63" id="kiwi_46_html63">
-                                 <area alt="kiwi0.tmp#id389" href="kiwi0.html#id389" coords="224,1,285,25" /></map></div>
+                           <div id="diagram_id381" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html161.jpeg"
+                                   usemap="#kiwi_46_html161" /><map name="kiwi_46_html161" id="kiwi_46_html161">
+                                 <area alt="kiwi0.tmp#id382" href="kiwi0.html#id382" coords="224,1,285,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id388" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id381" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id388');"
+                                     onclick="switchState('attributes_id381');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id388" style="display:block">
+                           <div id="attributes_id381" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -56445,7 +55776,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id389" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id382" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">alias</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -56462,12 +55793,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id388" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id388');"
+                           <div class="floatRight"><input id="button_source_id381" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id381');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id388" style="display:block">
+                           <div id="source_id381" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -56489,7 +55820,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id390"></a><div class="componentTitle">Attribute Group <span class="qname">k.repository.priority.attribute</span></div>
+      </table><a id="id383"></a><div class="componentTitle">Attribute Group <span class="qname">k.repository.priority.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -56508,26 +55839,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id390" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id390');"
+                           <div class="floatRight"><input id="button_diagram_id383" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id383');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id390" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html273.jpeg"
-                                   usemap="#kiwi_46_html273" /><map name="kiwi_46_html273" id="kiwi_46_html273">
-                                 <area alt="kiwi0.tmp#id391" href="kiwi0.html#id391" coords="240,0,359,42" /></map></div>
+                           <div id="diagram_id383" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html272.jpeg"
+                                   usemap="#kiwi_46_html272" /><map name="kiwi_46_html272" id="kiwi_46_html272">
+                                 <area alt="kiwi0.tmp#id384" href="kiwi0.html#id384" coords="240,0,359,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id390" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id383" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id390');"
+                                     onclick="switchState('attributes_id383');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id390" style="display:block">
+                           <div id="attributes_id383" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -56540,7 +55871,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id391" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id384" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">priority</a></b></td>
                                     <td><b>xs:integer</b></td>
                                     <td></td>
@@ -56557,12 +55888,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id390" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id390');"
+                           <div class="floatRight"><input id="button_source_id383" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id383');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id390" style="display:block">
+                           <div id="source_id383" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -56584,7 +55915,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id392"></a><div class="componentTitle">Attribute Group <span class="qname">k.size.unit.attribute</span></div>
+      </table><a id="id385"></a><div class="componentTitle">Attribute Group <span class="qname">k.size.unit.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -56603,26 +55934,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id392" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id392');"
+                           <div class="floatRight"><input id="button_diagram_id385" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id385');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id392" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html247.jpeg"
-                                   usemap="#kiwi_46_html247" /><map name="kiwi_46_html247" id="kiwi_46_html247">
-                                 <area alt="kiwi0.tmp#id393" href="kiwi0.html#id393" coords="186,0,376,42" /></map></div>
+                           <div id="diagram_id385" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html286.jpeg"
+                                   usemap="#kiwi_46_html286" /><map name="kiwi_46_html286" id="kiwi_46_html286">
+                                 <area alt="kiwi0.tmp#id386" href="kiwi0.html#id386" coords="186,0,376,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id392" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id385" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id392');"
+                                     onclick="switchState('attributes_id385');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id392" style="display:block">
+                           <div id="attributes_id385" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -56635,7 +55966,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id393" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id386" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">unit</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -56659,12 +55990,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id392" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id392');"
+                           <div class="floatRight"><input id="button_source_id385" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id385');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id392" style="display:block">
+                           <div id="source_id385" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -56696,7 +56027,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id394"></a><div class="componentTitle">Attribute Group <span class="qname">k.size.additive.attribute</span></div>
+      </table><a id="id387"></a><div class="componentTitle">Attribute Group <span class="qname">k.size.additive.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -56715,25 +56046,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id394" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id394');"
+                           <div class="floatRight"><input id="button_diagram_id387" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id387');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id394" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html23.jpeg" usemap="#kiwi_46_html23" /><map name="kiwi_46_html23" id="kiwi_46_html23">
-                                 <area alt="kiwi0.tmp#id395" href="kiwi0.html#id395" coords="207,0,331,42" /></map></div>
+                           <div id="diagram_id387" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html152.jpeg"
+                                   usemap="#kiwi_46_html152" /><map name="kiwi_46_html152" id="kiwi_46_html152">
+                                 <area alt="kiwi0.tmp#id388" href="kiwi0.html#id388" coords="207,0,331,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id394" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id387" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id394');"
+                                     onclick="switchState('attributes_id387');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id394" style="display:block">
+                           <div id="attributes_id387" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -56746,7 +56078,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id395" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id388" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">additive</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -56763,12 +56095,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id394" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id394');"
+                           <div class="floatRight"><input id="button_source_id387" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id387');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id394" style="display:block">
+                           <div id="source_id387" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -56790,7 +56122,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id396"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.fsnocheck.attribute</span></div>
+      </table><a id="id389"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.fsnocheck.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -56809,26 +56141,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id396" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id396');"
+                           <div class="floatRight"><input id="button_diagram_id389" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id389');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id396" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html283.jpeg"
-                                   usemap="#kiwi_46_html283" /><map name="kiwi_46_html283" id="kiwi_46_html283">
-                                 <area alt="kiwi0.tmp#id397" href="kiwi0.html#id397" coords="222,0,346,42" /></map></div>
+                           <div id="diagram_id389" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html102.jpeg"
+                                   usemap="#kiwi_46_html102" /><map name="kiwi_46_html102" id="kiwi_46_html102">
+                                 <area alt="kiwi0.tmp#id390" href="kiwi0.html#id390" coords="222,0,346,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id396" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id389" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id396');"
+                                     onclick="switchState('attributes_id389');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id396" style="display:block">
+                           <div id="attributes_id389" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -56841,7 +56173,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id397" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id390" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">fsnocheck</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -56865,12 +56197,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id396" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id396');"
+                           <div class="floatRight"><input id="button_source_id389" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id389');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id396" style="display:block">
+                           <div id="source_id389" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -56896,7 +56228,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id398"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.lvm.attribute</span></div>
+      </table><a id="id391"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.lvm.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -56915,25 +56247,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id398" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id398');"
+                           <div class="floatRight"><input id="button_diagram_id391" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id391');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id398" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html70.jpeg" usemap="#kiwi_46_html70" /><map name="kiwi_46_html70" id="kiwi_46_html70">
-                                 <area alt="kiwi0.tmp#id399" href="kiwi0.html#id399" coords="186,0,310,42" /></map></div>
+                           <div id="diagram_id391" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html215.jpeg"
+                                   usemap="#kiwi_46_html215" /><map name="kiwi_46_html215" id="kiwi_46_html215">
+                                 <area alt="kiwi0.tmp#id392" href="kiwi0.html#id392" coords="186,0,310,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id398" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id391" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id398');"
+                                     onclick="switchState('attributes_id391');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id398" style="display:block">
+                           <div id="attributes_id391" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -56946,7 +56279,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id399" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id392" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvm</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -56963,12 +56296,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id398" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id398');"
+                           <div class="floatRight"><input id="button_source_id391" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id391');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id398" style="display:block">
+                           <div id="source_id391" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -56990,7 +56323,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id400"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.baseroot.attribute</span></div>
+      </table><a id="id393"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.baseroot.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -57009,26 +56342,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id400" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id400');"
+                           <div class="floatRight"><input id="button_diagram_id393" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id393');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id400" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html171.jpeg"
-                                   usemap="#kiwi_46_html171" /><map name="kiwi_46_html171" id="kiwi_46_html171">
-                                 <area alt="kiwi0.tmp#id401" href="kiwi0.html#id401" coords="215,1,300,25" /></map></div>
+                           <div id="diagram_id393" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html205.jpeg"
+                                   usemap="#kiwi_46_html205" /><map name="kiwi_46_html205" id="kiwi_46_html205">
+                                 <area alt="kiwi0.tmp#id394" href="kiwi0.html#id394" coords="215,1,300,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id400" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id393" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id400');"
+                                     onclick="switchState('attributes_id393');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id400" style="display:block">
+                           <div id="attributes_id393" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -57041,7 +56374,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id401" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id394" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">baseroot</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -57065,12 +56398,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id400" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id400');"
+                           <div class="floatRight"><input id="button_source_id393" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id393');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id400" style="display:block">
+                           <div id="source_id393" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -57096,7 +56429,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id402"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.bootprofile.attribute</span></div>
+      </table><a id="id395"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.bootprofile.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -57115,26 +56448,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id402" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id402');"
+                           <div class="floatRight"><input id="button_diagram_id395" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id395');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id402" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html125.jpeg"
-                                   usemap="#kiwi_46_html125" /><map name="kiwi_46_html125" id="kiwi_46_html125">
-                                 <area alt="kiwi0.tmp#id403" href="kiwi0.html#id403" coords="227,1,324,25" /></map></div>
+                           <div id="diagram_id395" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html190.jpeg"
+                                   usemap="#kiwi_46_html190" /><map name="kiwi_46_html190" id="kiwi_46_html190">
+                                 <area alt="kiwi0.tmp#id396" href="kiwi0.html#id396" coords="227,1,324,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id402" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id395" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id402');"
+                                     onclick="switchState('attributes_id395');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id402" style="display:block">
+                           <div id="attributes_id395" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -57147,7 +56480,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id403" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id396" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootprofile</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -57164,12 +56497,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id402" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id402');"
+                           <div class="floatRight"><input id="button_source_id395" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id395');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id402" style="display:block">
+                           <div id="source_id395" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -57191,7 +56524,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id404"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.bootkernel.attribute</span></div>
+      </table><a id="id397"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.bootkernel.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -57210,25 +56543,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id404" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id404');"
+                           <div class="floatRight"><input id="button_diagram_id397" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id397');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id404" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html44.jpeg" usemap="#kiwi_46_html44" /><map name="kiwi_46_html44" id="kiwi_46_html44">
-                                 <area alt="kiwi0.tmp#id405" href="kiwi0.html#id405" coords="225,1,320,25" /></map></div>
+                           <div id="diagram_id397" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html25.jpeg" usemap="#kiwi_46_html25" /><map name="kiwi_46_html25" id="kiwi_46_html25">
+                                 <area alt="kiwi0.tmp#id398" href="kiwi0.html#id398" coords="225,1,320,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id404" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id397" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id404');"
+                                     onclick="switchState('attributes_id397');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id404" style="display:block">
+                           <div id="attributes_id397" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -57241,7 +56574,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id405" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id398" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootkernel</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -57258,12 +56591,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id404" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id404');"
+                           <div class="floatRight"><input id="button_source_id397" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id397');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id404" style="display:block">
+                           <div id="source_id397" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -57285,7 +56618,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id406"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.boot.attribute</span></div>
+      </table><a id="id399"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.boot.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -57304,26 +56637,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id406" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id406');"
+                           <div class="floatRight"><input id="button_diagram_id399" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id399');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id406" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html180.jpeg"
-                                   usemap="#kiwi_46_html180" /><map name="kiwi_46_html180" id="kiwi_46_html180">
-                                 <area alt="kiwi0.tmp#id407" href="kiwi0.html#id407" coords="192,1,254,25" /></map></div>
+                           <div id="diagram_id399" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html234.jpeg"
+                                   usemap="#kiwi_46_html234" /><map name="kiwi_46_html234" id="kiwi_46_html234">
+                                 <area alt="kiwi0.tmp#id400" href="kiwi0.html#id400" coords="192,1,254,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id406" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id399" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id406');"
+                                     onclick="switchState('attributes_id399');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id406" style="display:block">
+                           <div id="attributes_id399" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -57336,7 +56669,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id407" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id400" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">boot</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -57353,12 +56686,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id406" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id406');"
+                           <div class="floatRight"><input id="button_source_id399" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id399');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id406" style="display:block">
+                           <div id="source_id399" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -57380,7 +56713,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id408"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.checkprebuilt.attribute</span></div>
+      </table><a id="id401"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.checkprebuilt.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -57399,26 +56732,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id408" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id408');"
+                           <div class="floatRight"><input id="button_diagram_id401" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id401');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id408" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html228.jpeg"
-                                   usemap="#kiwi_46_html228" /><map name="kiwi_46_html228" id="kiwi_46_html228">
-                                 <area alt="kiwi0.tmp#id409" href="kiwi0.html#id409" coords="240,0,364,42" /></map></div>
+                           <div id="diagram_id401" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html133.jpeg"
+                                   usemap="#kiwi_46_html133" /><map name="kiwi_46_html133" id="kiwi_46_html133">
+                                 <area alt="kiwi0.tmp#id402" href="kiwi0.html#id402" coords="240,0,364,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id408" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id401" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id408');"
+                                     onclick="switchState('attributes_id401');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id408" style="display:block">
+                           <div id="attributes_id401" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -57431,7 +56764,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id409" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id402" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">checkprebuilt</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -57448,12 +56781,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id408" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id408');"
+                           <div class="floatRight"><input id="button_source_id401" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id401');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id408" style="display:block">
+                           <div id="source_id401" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -57475,7 +56808,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id410"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.volid.attribute</span></div>
+      </table><a id="id403"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.volid.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -57494,26 +56827,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id410" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id410');"
+                           <div class="floatRight"><input id="button_diagram_id403" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id403');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id410" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html165.jpeg"
-                                   usemap="#kiwi_46_html165" /><map name="kiwi_46_html165" id="kiwi_46_html165">
-                                 <area alt="kiwi0.tmp#id411" href="kiwi0.html#id411" coords="193,1,256,25" /></map></div>
+                           <div id="diagram_id403" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html220.jpeg"
+                                   usemap="#kiwi_46_html220" /><map name="kiwi_46_html220" id="kiwi_46_html220">
+                                 <area alt="kiwi0.tmp#id404" href="kiwi0.html#id404" coords="193,1,256,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id410" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id403" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id410');"
+                                     onclick="switchState('attributes_id403');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id410" style="display:block">
+                           <div id="attributes_id403" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -57526,7 +56859,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id411" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id404" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volid</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -57543,12 +56876,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id410" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id410');"
+                           <div class="floatRight"><input id="button_source_id403" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id403');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id410" style="display:block">
+                           <div id="source_id403" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -57570,7 +56903,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id412"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.flags.attribute</span></div>
+      </table><a id="id405"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.flags.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -57589,26 +56922,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id412" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id412');"
+                           <div class="floatRight"><input id="button_diagram_id405" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id405');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id412" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html166.jpeg"
-                                   usemap="#kiwi_46_html166" /><map name="kiwi_46_html166" id="kiwi_46_html166">
-                                 <area alt="kiwi0.tmp#id413" href="kiwi0.html#id413" coords="193,0,383,42" /></map></div>
+                           <div id="diagram_id405" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html34.jpeg" usemap="#kiwi_46_html34" /><map name="kiwi_46_html34" id="kiwi_46_html34">
+                                 <area alt="kiwi0.tmp#id406" href="kiwi0.html#id406" coords="193,0,383,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id412" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id405" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id412');"
+                                     onclick="switchState('attributes_id405');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id412" style="display:block">
+                           <div id="attributes_id405" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -57621,7 +56953,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id413" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id406" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">flags</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -57638,12 +56970,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id412" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id412');"
+                           <div class="floatRight"><input id="button_source_id405" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id405');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id412" style="display:block">
+                           <div id="source_id405" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -57673,7 +57005,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id414"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.hybrid.attribute</span></div>
+      </table><a id="id407"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.hybrid.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -57692,26 +57024,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id414" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id414');"
+                           <div class="floatRight"><input id="button_diagram_id407" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id407');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id414" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html284.jpeg"
-                                   usemap="#kiwi_46_html284" /><map name="kiwi_46_html284" id="kiwi_46_html284">
-                                 <area alt="kiwi0.tmp#id415" href="kiwi0.html#id415" coords="202,0,326,42" /></map></div>
+                           <div id="diagram_id407" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html207.jpeg"
+                                   usemap="#kiwi_46_html207" /><map name="kiwi_46_html207" id="kiwi_46_html207">
+                                 <area alt="kiwi0.tmp#id408" href="kiwi0.html#id408" coords="202,0,326,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id414" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id407" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id414');"
+                                     onclick="switchState('attributes_id407');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id414" style="display:block">
+                           <div id="attributes_id407" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -57724,7 +57056,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id415" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id408" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">hybrid</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -57741,12 +57073,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id414" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id414');"
+                           <div class="floatRight"><input id="button_source_id407" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id407');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id414" style="display:block">
+                           <div id="source_id407" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -57768,7 +57100,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id416"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.hybridpersistent.attribute</span></div>
+      </table><a id="id409"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.hybridpersistent.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -57787,25 +57119,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id416" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id416');"
+                           <div class="floatRight"><input id="button_diagram_id409" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id409');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id416" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html10.jpeg" usemap="#kiwi_46_html10" /><map name="kiwi_46_html10" id="kiwi_46_html10">
-                                 <area alt="kiwi0.tmp#id417" href="kiwi0.html#id417" coords="256,0,393,42" /></map></div>
+                           <div id="diagram_id409" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html164.jpeg"
+                                   usemap="#kiwi_46_html164" /><map name="kiwi_46_html164" id="kiwi_46_html164">
+                                 <area alt="kiwi0.tmp#id410" href="kiwi0.html#id410" coords="256,0,393,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id416" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id409" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id416');"
+                                     onclick="switchState('attributes_id409');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id416" style="display:block">
+                           <div id="attributes_id409" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -57818,7 +57151,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id417" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id410" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">hybridpersistent</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -57835,12 +57168,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id416" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id416');"
+                           <div class="floatRight"><input id="button_source_id409" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id409');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id416" style="display:block">
+                           <div id="source_id409" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -57862,7 +57195,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id418"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.bootloader.attribute</span></div>
+      </table><a id="id411"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.bootloader.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -57881,26 +57214,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id418" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id418');"
+                           <div class="floatRight"><input id="button_diagram_id411" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id411');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id418" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html237.jpeg"
-                                   usemap="#kiwi_46_html237" /><map name="kiwi_46_html237" id="kiwi_46_html237">
-                                 <area alt="kiwi0.tmp#id419" href="kiwi0.html#id419" coords="226,0,416,42" /></map></div>
+                           <div id="diagram_id411" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html66.jpeg" usemap="#kiwi_46_html66" /><map name="kiwi_46_html66" id="kiwi_46_html66">
+                                 <area alt="kiwi0.tmp#id412" href="kiwi0.html#id412" coords="226,0,416,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id418" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id411" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id418');"
+                                     onclick="switchState('attributes_id411');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id418" style="display:block">
+                           <div id="attributes_id411" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -57913,7 +57245,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id419" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id412" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">bootloader</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -57930,12 +57262,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id418" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id418');"
+                           <div class="floatRight"><input id="button_source_id411" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id411');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id418" style="display:block">
+                           <div id="source_id411" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -57946,6 +57278,7 @@
         </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"extlinux"</span><span class="tokenElement">/></span><span class="tokenIndent">
         </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"grub"</span><span class="tokenElement">/></span><span class="tokenIndent">
         </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"syslinux"</span><span class="tokenElement">/></span><span class="tokenIndent">
+        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"zipl"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
@@ -57965,7 +57298,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id420"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.compressed.attribute</span></div>
+      </table><a id="id413"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.compressed.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -57984,25 +57317,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id420" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id420');"
+                           <div class="floatRight"><input id="button_diagram_id413" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id413');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id420" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html28.jpeg" usemap="#kiwi_46_html28" /><map name="kiwi_46_html28" id="kiwi_46_html28">
-                                 <area alt="kiwi0.tmp#id421" href="kiwi0.html#id421" coords="233,0,357,42" /></map></div>
+                           <div id="diagram_id413" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html228.jpeg"
+                                   usemap="#kiwi_46_html228" /><map name="kiwi_46_html228" id="kiwi_46_html228">
+                                 <area alt="kiwi0.tmp#id414" href="kiwi0.html#id414" coords="233,0,357,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id420" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id413" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id420');"
+                                     onclick="switchState('attributes_id413');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id420" style="display:block">
+                           <div id="attributes_id413" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -58015,7 +57349,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id421" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id414" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">compressed</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -58032,12 +57366,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id420" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id420');"
+                           <div class="floatRight"><input id="button_source_id413" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id413');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id420" style="display:block">
+                           <div id="source_id413" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -58059,7 +57393,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id422"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.vga.attribute</span></div>
+      </table><a id="id415"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.vga.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -58078,26 +57412,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id422" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id422');"
+                           <div class="floatRight"><input id="button_diagram_id415" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id415');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id422" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html205.jpeg"
-                                   usemap="#kiwi_46_html205" /><map name="kiwi_46_html205" id="kiwi_46_html205">
-                                 <area alt="kiwi0.tmp#id423" href="kiwi0.html#id423" coords="186,1,247,25" /></map></div>
+                           <div id="diagram_id415" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html10.jpeg" usemap="#kiwi_46_html10" /><map name="kiwi_46_html10" id="kiwi_46_html10">
+                                 <area alt="kiwi0.tmp#id416" href="kiwi0.html#id416" coords="186,1,247,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id422" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id415" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id422');"
+                                     onclick="switchState('attributes_id415');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id422" style="display:block">
+                           <div id="attributes_id415" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -58110,7 +57443,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id423" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id416" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vga</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -58127,12 +57460,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id422" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id422');"
+                           <div class="floatRight"><input id="button_source_id415" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id415');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id422" style="display:block">
+                           <div id="source_id415" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -58154,7 +57487,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id424"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.luks.attribute</span></div>
+      </table><a id="id417"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.luks.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -58173,26 +57506,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id424" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id424');"
+                           <div class="floatRight"><input id="button_diagram_id417" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id417');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id424" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html207.jpeg"
-                                   usemap="#kiwi_46_html207" /><map name="kiwi_46_html207" id="kiwi_46_html207">
-                                 <area alt="kiwi0.tmp#id425" href="kiwi0.html#id425" coords="189,1,250,25" /></map></div>
+                           <div id="diagram_id417" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html54.jpeg" usemap="#kiwi_46_html54" /><map name="kiwi_46_html54" id="kiwi_46_html54">
+                                 <area alt="kiwi0.tmp#id418" href="kiwi0.html#id418" coords="189,1,250,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id424" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id417" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id424');"
+                                     onclick="switchState('attributes_id417');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id424" style="display:block">
+                           <div id="attributes_id417" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -58205,7 +57537,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id425" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id418" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">luks</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -58222,12 +57554,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id424" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id424');"
+                           <div class="floatRight"><input id="button_source_id417" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id417');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id424" style="display:block">
+                           <div id="source_id417" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -58249,7 +57581,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id426"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.filesystem.attribute</span></div>
+      </table><a id="id419"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.filesystem.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -58268,26 +57600,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id426" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id426');"
+                           <div class="floatRight"><input id="button_diagram_id419" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id419');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id426" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html258.jpeg"
-                                   usemap="#kiwi_46_html258" /><map name="kiwi_46_html258" id="kiwi_46_html258">
-                                 <area alt="kiwi0.tmp#id427" href="kiwi0.html#id427" coords="221,0,411,42" /></map></div>
+                           <div id="diagram_id419" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html202.jpeg"
+                                   usemap="#kiwi_46_html202" /><map name="kiwi_46_html202" id="kiwi_46_html202">
+                                 <area alt="kiwi0.tmp#id420" href="kiwi0.html#id420" coords="221,0,411,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id426" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id419" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id426');"
+                                     onclick="switchState('attributes_id419');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id426" style="display:block">
+                           <div id="attributes_id419" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -58300,7 +57632,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id427" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id420" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">filesystem</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -58317,12 +57649,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id426" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id426');"
+                           <div class="floatRight"><input id="button_source_id419" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id419');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id426" style="display:block">
+                           <div id="source_id419" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -58355,7 +57687,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id428"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.fsreadonly.attribute</span></div>
+      </table><a id="id421"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.fsreadonly.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -58374,26 +57706,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id428" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id428');"
+                           <div class="floatRight"><input id="button_diagram_id421" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id421');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id428" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html257.jpeg"
-                                   usemap="#kiwi_46_html257" /><map name="kiwi_46_html257" id="kiwi_46_html257">
-                                 <area alt="kiwi0.tmp#id429" href="kiwi0.html#id429" coords="224,0,414,42" /></map></div>
+                           <div id="diagram_id421" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html137.jpeg"
+                                   usemap="#kiwi_46_html137" /><map name="kiwi_46_html137" id="kiwi_46_html137">
+                                 <area alt="kiwi0.tmp#id422" href="kiwi0.html#id422" coords="224,0,414,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id428" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id421" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id428');"
+                                     onclick="switchState('attributes_id421');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id428" style="display:block">
+                           <div id="attributes_id421" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -58406,7 +57738,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id429" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id422" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">fsreadonly</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -58430,12 +57762,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id428" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id428');"
+                           <div class="floatRight"><input id="button_source_id421" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id421');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id428" style="display:block">
+                           <div id="source_id421" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -58470,7 +57802,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id430"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.fsreadwrite.attribute</span></div>
+      </table><a id="id423"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.fsreadwrite.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -58489,25 +57821,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id430" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id430');"
+                           <div class="floatRight"><input id="button_diagram_id423" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id423');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id430" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html97.jpeg" usemap="#kiwi_46_html97" /><map name="kiwi_46_html97" id="kiwi_46_html97">
-                                 <area alt="kiwi0.tmp#id431" href="kiwi0.html#id431" coords="227,0,417,42" /></map></div>
+                           <div id="diagram_id423" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html232.jpeg"
+                                   usemap="#kiwi_46_html232" /><map name="kiwi_46_html232" id="kiwi_46_html232">
+                                 <area alt="kiwi0.tmp#id424" href="kiwi0.html#id424" coords="227,0,417,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id430" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id423" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id430');"
+                                     onclick="switchState('attributes_id423');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id430" style="display:block">
+                           <div id="attributes_id423" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -58520,7 +57853,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id431" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id424" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">fsreadwrite</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -58544,12 +57877,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id430" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id430');"
+                           <div class="floatRight"><input id="button_source_id423" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id423');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id430" style="display:block">
+                           <div id="source_id423" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -58583,7 +57916,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id432"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.format.attribute</span></div>
+      </table><a id="id425"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.format.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -58602,26 +57935,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id432" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id432');"
+                           <div class="floatRight"><input id="button_diagram_id425" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id425');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id432" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html168.jpeg"
-                                   usemap="#kiwi_46_html168" /><map name="kiwi_46_html168" id="kiwi_46_html168">
-                                 <area alt="kiwi0.tmp#id433" href="kiwi0.html#id433" coords="203,0,393,42" /></map></div>
+                           <div id="diagram_id425" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html83.jpeg" usemap="#kiwi_46_html83" /><map name="kiwi_46_html83" id="kiwi_46_html83">
+                                 <area alt="kiwi0.tmp#id426" href="kiwi0.html#id426" coords="203,0,393,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id432" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id425" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id432');"
+                                     onclick="switchState('attributes_id425');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id432" style="display:block">
+                           <div id="attributes_id425" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -58634,14 +57966,21 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id433" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id426" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">format</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
                                     <td>
-                                       <div class="annotation"></div>
+                                       <div class="annotation">
+                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                                 class="preWrapContainer">
+                                             <tr>
+                                                <td width="100%"><pre><span class="tokenText">Specifies the format of the virtual disk.</span></pre></td>
+                                             </tr>
+                                          </table>
+                                       </div>
                                     </td>
                                  </tr>
                               </table>
@@ -58651,31 +57990,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id432" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id432');"
+                           <div class="floatRight"><input id="button_source_id425" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id425');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id432" style="display:block">
+                           <div id="source_id425" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
                                     <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.type.format.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"format"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Specifies the format of the virtual disk.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"bochs"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"cloop"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"cow"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"dmg"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"iso"</span><span class="tokenElement">/></span><span class="tokenIndent">
         </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ovf"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"qcow"</span><span class="tokenElement">/></span><span class="tokenIndent">
         </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"qcow2"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"usb"</span><span class="tokenElement">/></span><span class="tokenIndent">
         </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vmdk"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vpc"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"vvfat"</span><span class="tokenElement">/></span><span class="tokenIndent">
       </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
@@ -58695,7 +58028,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id434"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.primary.attribute</span></div>
+      </table><a id="id427"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.installiso.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -58714,25 +58047,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id434" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id434');"
+                           <div class="floatRight"><input id="button_diagram_id427" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id427');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id434" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html12.jpeg" usemap="#kiwi_46_html12" /><map name="kiwi_46_html12" id="kiwi_46_html12">
-                                 <area alt="kiwi0.tmp#id435" href="kiwi0.html#id435" coords="209,0,333,42" /></map></div>
+                           <div id="diagram_id427" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html86.jpeg" usemap="#kiwi_46_html86" /><map name="kiwi_46_html86" id="kiwi_46_html86">
+                                 <area alt="kiwi0.tmp#id428" href="kiwi0.html#id428" coords="215,0,339,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id434" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id427" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id434');"
+                                     onclick="switchState('attributes_id427');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id434" style="display:block">
+                           <div id="attributes_id427" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -58745,7 +58078,218 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id435" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id428" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">installiso</a></b></td>
+                                    <td><b>xs:boolean</b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>required</td>
+                                    <td>
+                                       <div class="annotation">
+                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                                 class="preWrapContainer">
+                                             <tr>
+                                                <td width="100%"><pre><span class="tokenText">Specifies if a install iso should be created (oem only)</span></pre></td>
+                                             </tr>
+                                          </table>
+                                       </div>
+                                    </td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id427" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id427');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="source_id427" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
+                                 <tr>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.type.installiso.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"installiso"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Specifies if a install iso should be created (oem only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
+</span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id429"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.installstick.attribute</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>No namespace</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Diagram</b></div>
+                           <div class="floatRight"><input id="button_diagram_id429" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id429');"
+                                     class="control" /></div>
+                        </td>
+                        <td class="diagram">
+                           <div id="diagram_id429" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html63.jpeg" usemap="#kiwi_46_html63" /><map name="kiwi_46_html63" id="kiwi_46_html63">
+                                 <area alt="kiwi0.tmp#id430" href="kiwi0.html#id430" coords="224,0,348,42" /></map></div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Attributes</b></div>
+                           <div class="floatRight"><input id="button_attributes_id429" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('attributes_id429');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="attributes_id429" style="display:block">
+                              <table class="attributesTable">
+                                 <thead>
+                                    <tr>
+                                       <th>QName</th>
+                                       <th>Type</th>
+                                       <th>Fixed</th>
+                                       <th>Default</th>
+                                       <th>Use</th>
+                                       <th>Annotation</th>
+                                    </tr>
+                                 </thead>
+                                 <tr>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id430" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">installstick</a></b></td>
+                                    <td><b>xs:boolean</b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>required</td>
+                                    <td>
+                                       <div class="annotation">
+                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                                 class="preWrapContainer">
+                                             <tr>
+                                                <td width="100%"><pre><span class="tokenText">Specifies if a install stick should be created (oem only)</span></pre></td>
+                                             </tr>
+                                          </table>
+                                       </div>
+                                    </td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id429" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id429');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="source_id429" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
+                                 <tr>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.type.installstick.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"installstick"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Specifies if a install stick should be created (oem only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
+</span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id431"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.primary.attribute</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>No namespace</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Diagram</b></div>
+                           <div class="floatRight"><input id="button_diagram_id431" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id431');"
+                                     class="control" /></div>
+                        </td>
+                        <td class="diagram">
+                           <div id="diagram_id431" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html169.jpeg"
+                                   usemap="#kiwi_46_html169" /><map name="kiwi_46_html169" id="kiwi_46_html169">
+                                 <area alt="kiwi0.tmp#id432" href="kiwi0.html#id432" coords="209,0,333,42" /></map></div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Attributes</b></div>
+                           <div class="floatRight"><input id="button_attributes_id431" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('attributes_id431');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="attributes_id431" style="display:block">
+                              <table class="attributesTable">
+                                 <thead>
+                                    <tr>
+                                       <th>QName</th>
+                                       <th>Type</th>
+                                       <th>Fixed</th>
+                                       <th>Default</th>
+                                       <th>Use</th>
+                                       <th>Annotation</th>
+                                    </tr>
+                                 </thead>
+                                 <tr>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id432" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">primary</a></b></td>
                                     <td><b>xs:boolean</b></td>
                                     <td></td>
@@ -58769,12 +58313,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id434" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id434');"
+                           <div class="floatRight"><input id="button_source_id431" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id431');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id434" style="display:block">
+                           <div id="source_id431" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -58800,7 +58344,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id436"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.kernelcmdline.attribute</span></div>
+      </table><a id="id433"></a><div class="componentTitle">Attribute Group <span class="qname">k.type.kernelcmdline.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -58819,26 +58363,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id436" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id436');"
+                           <div class="floatRight"><input id="button_diagram_id433" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id433');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id436" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html219.jpeg"
-                                   usemap="#kiwi_46_html219" /><map name="kiwi_46_html219" id="kiwi_46_html219">
-                                 <area alt="kiwi0.tmp#id437" href="kiwi0.html#id437" coords="242,1,354,25" /></map></div>
+                           <div id="diagram_id433" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html237.jpeg"
+                                   usemap="#kiwi_46_html237" /><map name="kiwi_46_html237" id="kiwi_46_html237">
+                                 <area alt="kiwi0.tmp#id434" href="kiwi0.html#id434" coords="242,1,354,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id436" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id433" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id436');"
+                                     onclick="switchState('attributes_id433');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id436" style="display:block">
+                           <div id="attributes_id433" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -58851,7 +58395,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id437" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id434" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">kernelcmdline</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -58868,12 +58412,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id436" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id436');"
+                           <div class="floatRight"><input id="button_source_id433" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id433');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id436" style="display:block">
+                           <div id="source_id433" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -58895,7 +58439,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id438"></a><div class="componentTitle">Attribute Group <span class="qname">k.volume.freespace.attribute</span></div>
+      </table><a id="id435"></a><div class="componentTitle">Attribute Group <span class="qname">k.volume.freespace.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -58914,26 +58458,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id438" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id438');"
+                           <div class="floatRight"><input id="button_diagram_id435" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id435');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id438" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html163.jpeg"
-                                   usemap="#kiwi_46_html163" /><map name="kiwi_46_html163" id="kiwi_46_html163">
-                                 <area alt="kiwi0.tmp#id439" href="kiwi0.html#id439" coords="235,0,395,42" /></map></div>
+                           <div id="diagram_id435" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html213.jpeg"
+                                   usemap="#kiwi_46_html213" /><map name="kiwi_46_html213" id="kiwi_46_html213">
+                                 <area alt="kiwi0.tmp#id436" href="kiwi0.html#id436" coords="235,0,395,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id438" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id435" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id438');"
+                                     onclick="switchState('attributes_id435');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id438" style="display:block">
+                           <div id="attributes_id435" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -58946,7 +58490,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id439" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id436" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">freespace</a></b></td>
                                     <td><b><a href="kiwi0.html#id3" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volume-size-type</a></b></td>
@@ -58964,12 +58508,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id438" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id438');"
+                           <div class="floatRight"><input id="button_source_id435" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id435');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id438" style="display:block">
+                           <div id="source_id435" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -58991,7 +58535,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id440"></a><div class="componentTitle">Attribute Group <span class="qname">k.volume.size.attribute</span></div>
+      </table><a id="id437"></a><div class="componentTitle">Attribute Group <span class="qname">k.volume.size.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -59010,26 +58554,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id440" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id440');"
+                           <div class="floatRight"><input id="button_diagram_id437" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id437');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id440" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html173.jpeg"
-                                   usemap="#kiwi_46_html173" /><map name="kiwi_46_html173" id="kiwi_46_html173">
-                                 <area alt="kiwi0.tmp#id441" href="kiwi0.html#id441" coords="204,0,364,42" /></map></div>
+                           <div id="diagram_id437" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html225.jpeg"
+                                   usemap="#kiwi_46_html225" /><map name="kiwi_46_html225" id="kiwi_46_html225">
+                                 <area alt="kiwi0.tmp#id438" href="kiwi0.html#id438" coords="204,0,364,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id440" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id437" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id440');"
+                                     onclick="switchState('attributes_id437');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id440" style="display:block">
+                           <div id="attributes_id437" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -59042,7 +58586,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id441" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id438" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b></td>
                                     <td><b><a href="kiwi0.html#id3" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volume-size-type</a></b></td>
@@ -59060,12 +58604,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id440" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id440');"
+                           <div class="floatRight"><input id="button_source_id437" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id437');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id440" style="display:block">
+                           <div id="source_id437" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -59087,7 +58631,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id442"></a><div class="componentTitle">Attribute Group <span class="qname">k.lvmvolumes.lvmgroup.attribute</span></div>
+      </table><a id="id439"></a><div class="componentTitle">Attribute Group <span class="qname">k.lvmvolumes.lvmgroup.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -59106,26 +58650,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id442" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id442');"
+                           <div class="floatRight"><input id="button_diagram_id439" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id439');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id442" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html287.jpeg"
-                                   usemap="#kiwi_46_html287" /><map name="kiwi_46_html287" id="kiwi_46_html287">
-                                 <area alt="kiwi0.tmp#id443" href="kiwi0.html#id443" coords="260,1,349,25" /></map></div>
+                           <div id="diagram_id439" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html248.jpeg"
+                                   usemap="#kiwi_46_html248" /><map name="kiwi_46_html248" id="kiwi_46_html248">
+                                 <area alt="kiwi0.tmp#id440" href="kiwi0.html#id440" coords="260,1,349,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id442" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id439" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id442');"
+                                     onclick="switchState('attributes_id439');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id442" style="display:block">
+                           <div id="attributes_id439" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -59138,7 +58682,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id443" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id440" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvmgroup</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -59162,12 +58706,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id442" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id442');"
+                           <div class="floatRight"><input id="button_source_id439" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id439');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id442" style="display:block">
+                           <div id="source_id439" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -59193,7 +58737,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id444"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.id.attribute</span></div>
+      </table><a id="id441"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.id.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -59212,26 +58756,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id444" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id444');"
+                           <div class="floatRight"><input id="button_diagram_id441" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id441');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id444" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html232.jpeg"
-                                   usemap="#kiwi_46_html232" /><map name="kiwi_46_html232" id="kiwi_46_html232">
-                                 <area alt="kiwi0.tmp#id445" href="kiwi0.html#id445" coords="178,0,364,42" /></map></div>
+                           <div id="diagram_id441" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html76.jpeg" usemap="#kiwi_46_html76" /><map name="kiwi_46_html76" id="kiwi_46_html76">
+                                 <area alt="kiwi0.tmp#id442" href="kiwi0.html#id442" coords="178,0,364,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id444" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id441" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id444');"
+                                     onclick="switchState('attributes_id441');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id444" style="display:block">
+                           <div id="attributes_id441" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -59244,7 +58787,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id445" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id442" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -59268,12 +58811,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id444" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id444');"
+                           <div class="floatRight"><input id="button_source_id441" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id441');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id444" style="display:block">
+                           <div id="source_id441" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -59299,7 +58842,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id446"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.realname.attribute</span></div>
+      </table><a id="id443"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.realname.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -59318,26 +58861,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id446" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id446');"
+                           <div class="floatRight"><input id="button_diagram_id443" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id443');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id446" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html176.jpeg"
-                                   usemap="#kiwi_46_html176" /><map name="kiwi_46_html176" id="kiwi_46_html176">
-                                 <area alt="kiwi0.tmp#id447" href="kiwi0.html#id447" coords="217,1,303,25" /></map></div>
+                           <div id="diagram_id443" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html35.jpeg" usemap="#kiwi_46_html35" /><map name="kiwi_46_html35" id="kiwi_46_html35">
+                                 <area alt="kiwi0.tmp#id444" href="kiwi0.html#id444" coords="217,1,303,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id446" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id443" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id446');"
+                                     onclick="switchState('attributes_id443');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id446" style="display:block">
+                           <div id="attributes_id443" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -59350,7 +58892,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id447" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id444" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">realname</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -59374,12 +58916,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id446" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id446');"
+                           <div class="floatRight"><input id="button_source_id443" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id443');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id446" style="display:block">
+                           <div id="source_id443" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -59405,7 +58947,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id448"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.pwdformat</span></div>
+      </table><a id="id445"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.pwdformat</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -59424,26 +58966,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id448" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id448');"
+                           <div class="floatRight"><input id="button_diagram_id445" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id445');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id448" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html271.jpeg"
-                                   usemap="#kiwi_46_html271" /><map name="kiwi_46_html271" id="kiwi_46_html271">
-                                 <area alt="kiwi0.tmp#id449" href="kiwi0.html#id449" coords="177,0,367,42" /></map></div>
+                           <div id="diagram_id445" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html56.jpeg" usemap="#kiwi_46_html56" /><map name="kiwi_46_html56" id="kiwi_46_html56">
+                                 <area alt="kiwi0.tmp#id446" href="kiwi0.html#id446" coords="177,0,367,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id448" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id445" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id448');"
+                                     onclick="switchState('attributes_id445');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id448" style="display:block">
+                           <div id="attributes_id445" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -59456,7 +58997,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id449" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id446" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pwdformat</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -59480,12 +59021,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id448" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id448');"
+                           <div class="floatRight"><input id="button_source_id445" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id445');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id448" style="display:block">
+                           <div id="source_id445" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -59517,7 +59058,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id450"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.shell.attribute</span></div>
+      </table><a id="id447"></a><div class="componentTitle">Attribute Group <span class="qname">k.user.shell.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -59536,26 +59077,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id450" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id450');"
+                           <div class="floatRight"><input id="button_diagram_id447" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id447');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id450" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html223.jpeg"
-                                   usemap="#kiwi_46_html223" /><map name="kiwi_46_html223" id="kiwi_46_html223">
-                                 <area alt="kiwi0.tmp#id451" href="kiwi0.html#id451" coords="193,1,255,25" /></map></div>
+                           <div id="diagram_id447" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html36.jpeg" usemap="#kiwi_46_html36" /><map name="kiwi_46_html36" id="kiwi_46_html36">
+                                 <area alt="kiwi0.tmp#id448" href="kiwi0.html#id448" coords="193,1,255,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id450" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id447" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id450');"
+                                     onclick="switchState('attributes_id447');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id450" style="display:block">
+                           <div id="attributes_id447" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -59568,7 +59108,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id451" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id448" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">shell</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -59592,12 +59132,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id450" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id450');"
+                           <div class="floatRight"><input id="button_source_id447" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id447');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id450" style="display:block">
+                           <div id="source_id447" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -59623,7 +59163,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id452"></a><div class="componentTitle">Attribute Group <span class="qname">k.xenbridge.mac.attribute</span></div>
+      </table><a id="id449"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmnic.driver.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -59642,25 +59182,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id452" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id452');"
+                           <div class="floatRight"><input id="button_diagram_id449" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id449');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id452" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html36.jpeg" usemap="#kiwi_46_html36" /><map name="kiwi_46_html36" id="kiwi_46_html36">
-                                 <area alt="kiwi0.tmp#id453" href="kiwi0.html#id453" coords="221,1,282,25" /></map></div>
+                           <div id="diagram_id449" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html252.jpeg"
+                                   usemap="#kiwi_46_html252" /><map name="kiwi_46_html252" id="kiwi_46_html252">
+                                 <area alt="kiwi0.tmp#id450" href="kiwi0.html#id450" coords="208,1,277,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id452" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id449" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id452');"
+                                     onclick="switchState('attributes_id449');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id452" style="display:block">
+                           <div id="attributes_id449" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -59673,8 +59214,8 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id453" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mac</a></b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id450" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">driver</a></b></td>
                                     <td></td>
                                     <td></td>
                                     <td></td>
@@ -59684,7 +59225,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The Mac address to assign to the virtual interface</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The driver used for the VM network interface</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -59697,19 +59238,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id452" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id452');"
+                           <div class="floatRight"><input id="button_source_id449" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id449');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id452" style="display:block">
+                           <div id="source_id449" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.xenbridge.mac.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mac"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmnic.driver.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"driver"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The Mac address to assign to the virtual interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The driver used for the VM network interface</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
@@ -59728,7 +59269,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id454"></a><div class="componentTitle">Attribute Group <span class="qname">k.pxedeploy.server.attribute</span></div>
+      </table><a id="id451"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmnic.mode.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -59747,26 +59288,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id454" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id454');"
+                           <div class="floatRight"><input id="button_diagram_id451" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id451');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id454" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html175.jpeg"
-                                   usemap="#kiwi_46_html175" /><map name="kiwi_46_html175" id="kiwi_46_html175">
-                                 <area alt="kiwi0.tmp#id455" href="kiwi0.html#id455" coords="234,1,305,25" /></map></div>
+                           <div id="diagram_id451" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html224.jpeg"
+                                   usemap="#kiwi_46_html224" /><map name="kiwi_46_html224" id="kiwi_46_html224">
+                                 <area alt="kiwi0.tmp#id452" href="kiwi0.html#id452" coords="206,1,273,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id454" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id451" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id454');"
+                                     onclick="switchState('attributes_id451');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id454" style="display:block">
+                           <div id="attributes_id451" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -59779,8 +59320,8 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id455" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">server</a></b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id452" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mode</a></b></td>
                                     <td></td>
                                     <td></td>
                                     <td></td>
@@ -59790,7 +59331,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">Name or IP Address of server for downloading the data</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The VM network mode</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -59803,19 +59344,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id454" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id454');"
+                           <div class="floatRight"><input id="button_source_id451" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id451');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id454" style="display:block">
+                           <div id="source_id451" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.pxedeploy.server.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"server"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmnic.mode.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mode"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Name or IP Address of server for downloading the data</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VM network mode</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
@@ -59834,7 +59375,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id456"></a><div class="componentTitle">Attribute Group <span class="qname">k.pxedeploy.blocksize.attribute</span></div>
+      </table><a id="id453"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmnic.mac.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -59853,26 +59394,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id456" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id456');"
+                           <div class="floatRight"><input id="button_diagram_id453" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id453');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id456" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html251.jpeg"
-                                   usemap="#kiwi_46_html251" /><map name="kiwi_46_html251" id="kiwi_46_html251">
-                                 <area alt="kiwi0.tmp#id457" href="kiwi0.html#id457" coords="250,0,436,42" /></map></div>
+                           <div id="diagram_id453" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html261.jpeg"
+                                   usemap="#kiwi_46_html261" /><map name="kiwi_46_html261" id="kiwi_46_html261">
+                                 <area alt="kiwi0.tmp#id454" href="kiwi0.html#id454" coords="198,1,259,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id456" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id453" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id456');"
+                                     onclick="switchState('attributes_id453');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id456" style="display:block">
+                           <div id="attributes_id453" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -59885,9 +59426,9 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id457" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">blocksize</a></b></td>
-                                    <td><b>xs:nonNegativeInteger</b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id454" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">mac</a></b></td>
+                                    <td></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -59896,7 +59437,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">Blocksize value used for atftp downloads</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The VM mac address</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -59909,19 +59450,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id456" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id456');"
+                           <div class="floatRight"><input id="button_source_id453" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id453');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id456" style="display:block">
+                           <div id="source_id453" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.pxedeploy.blocksize.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"blocksize"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:nonNegativeInteger"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmnic.mac.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"mac"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Blocksize value used for atftp downloads</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The VM mac address</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
@@ -59940,7 +59481,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id458"></a><div class="componentTitle">Attribute Group <span class="qname">k.drivers.profiles.attribute</span></div>
+      </table><a id="id455"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmdisk.device.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -59959,27 +59500,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id458" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id458');"
+                           <div class="floatRight"><input id="button_diagram_id455" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id455');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id458" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html212.jpeg"
-                                   usemap="#kiwi_46_html212" /><map name="kiwi_46_html212" id="kiwi_46_html212">
-                                 <area alt="kiwi0.tmp#id344" href="kiwi0.html#id344" coords="237,44,315,68" />
-                                 <area alt="kiwi0.tmp#id343" href="kiwi0.html#id343" coords="226,3,380,29" /></map></div>
+                           <div id="diagram_id455" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html208.jpeg"
+                                   usemap="#kiwi_46_html208" /><map name="kiwi_46_html208" id="kiwi_46_html208">
+                                 <area alt="kiwi0.tmp#id456" href="kiwi0.html#id456" coords="216,1,287,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id458" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id455" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id458');"
+                                     onclick="switchState('attributes_id455');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id458" style="display:block">
+                           <div id="attributes_id455" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -59992,8 +59532,8 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id344" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id456" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">device</a></b></td>
                                     <td></td>
                                     <td></td>
                                     <td></td>
@@ -60003,7 +59543,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">A profile name which binds the section to this name</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The disk device to appear in the guest (xen only)</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -60016,17 +59556,21 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id458" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id458');"
+                           <div class="floatRight"><input id="button_source_id455" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id455');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id458" style="display:block">
+                           <div id="source_id455" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.drivers.profiles.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.profiles.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmdisk.device.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"device"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The disk device to appear in the guest (xen only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
                                  </tr>
                               </table>
@@ -60043,7 +59587,113 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id459"></a><div class="componentTitle">Attribute Group <span class="qname">k.arch.fallback.attribute</span></div>
+      </table><a id="id457"></a><div class="componentTitle">Attribute Group <span class="qname">k.pxedeploy.server.attribute</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>No namespace</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Diagram</b></div>
+                           <div class="floatRight"><input id="button_diagram_id457" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id457');"
+                                     class="control" /></div>
+                        </td>
+                        <td class="diagram">
+                           <div id="diagram_id457" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html110.jpeg"
+                                   usemap="#kiwi_46_html110" /><map name="kiwi_46_html110" id="kiwi_46_html110">
+                                 <area alt="kiwi0.tmp#id458" href="kiwi0.html#id458" coords="234,1,305,25" /></map></div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Attributes</b></div>
+                           <div class="floatRight"><input id="button_attributes_id457" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('attributes_id457');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="attributes_id457" style="display:block">
+                              <table class="attributesTable">
+                                 <thead>
+                                    <tr>
+                                       <th>QName</th>
+                                       <th>Type</th>
+                                       <th>Fixed</th>
+                                       <th>Default</th>
+                                       <th>Use</th>
+                                       <th>Annotation</th>
+                                    </tr>
+                                 </thead>
+                                 <tr>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id458" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">server</a></b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>required</td>
+                                    <td>
+                                       <div class="annotation">
+                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                                 class="preWrapContainer">
+                                             <tr>
+                                                <td width="100%"><pre><span class="tokenText">Name or IP Address of server for downloading the data</span></pre></td>
+                                             </tr>
+                                          </table>
+                                       </div>
+                                    </td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id457" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id457');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="source_id457" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
+                                 <tr>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.pxedeploy.server.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"server"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Name or IP Address of server for downloading the data</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
+</span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id459"></a><div class="componentTitle">Attribute Group <span class="qname">k.pxedeploy.blocksize.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -60067,9 +59717,8 @@
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id459" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html145.jpeg"
-                                   usemap="#kiwi_46_html145" /><map name="kiwi_46_html145" id="kiwi_46_html145">
-                                 <area alt="kiwi0.tmp#id460" href="kiwi0.html#id460" coords="209,0,320,42" /></map></div>
+                           <div id="diagram_id459" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html71.jpeg" usemap="#kiwi_46_html71" /><map name="kiwi_46_html71" id="kiwi_46_html71">
+                                 <area alt="kiwi0.tmp#id460" href="kiwi0.html#id460" coords="250,0,436,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
@@ -60095,13 +59744,20 @@
                                  </thead>
                                  <tr>
                                     <td class="firstColumn"><b><a href="kiwi0.html#id460" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">fallback</a></b></td>
-                                    <td><b>xs:IDREF</b></td>
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">blocksize</a></b></td>
+                                    <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
                                     <td>
-                                       <div class="annotation"></div>
+                                       <div class="annotation">
+                                          <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                                 class="preWrapContainer">
+                                             <tr>
+                                                <td width="100%"><pre><span class="tokenText">Blocksize value used for atftp downloads</span></pre></td>
+                                             </tr>
+                                          </table>
+                                       </div>
                                     </td>
                                  </tr>
                               </table>
@@ -60120,8 +59776,12 @@
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.arch.fallback.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"fallback"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:IDREF"</span><span class="tokenElement">/></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.pxedeploy.blocksize.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"blocksize"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:nonNegativeInteger"</span><span class="tokenElement">></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Blocksize value used for atftp downloads</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
                                  </tr>
                               </table>
@@ -60138,7 +59798,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id461"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwareconfig.arch.attribute</span></div>
+      </table><a id="id461"></a><div class="componentTitle">Attribute Group <span class="qname">k.drivers.profiles.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -60162,9 +59822,9 @@
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id461" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html190.jpeg"
-                                   usemap="#kiwi_46_html190" /><map name="kiwi_46_html190" id="kiwi_46_html190">
-                                 <area alt="kiwi0.tmp#id462" href="kiwi0.html#id462" coords="243,0,433,42" /></map></div>
+                           <div id="diagram_id461" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html93.jpeg" usemap="#kiwi_46_html93" /><map name="kiwi_46_html93" id="kiwi_46_html93">
+                                 <area alt="kiwi0.tmp#id337" href="kiwi0.html#id337" coords="237,44,315,68" />
+                                 <area alt="kiwi0.tmp#id336" href="kiwi0.html#id336" coords="226,3,380,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
@@ -60189,9 +59849,9 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id462" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
-                                    <td>restriction of <b>xs:token</b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id337" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
+                                    <td></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -60200,7 +59860,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">the VMware architecture type</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">A profile name which binds the section to this name</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -60222,19 +59882,8 @@
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwareconfig.arch.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"arch"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the VMware architecture type</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
-    </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ix86"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"x86_64"</span><span class="tokenElement">/></span><span class="tokenIndent">
-        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"%arch"</span><span class="tokenElement">/></span><span class="tokenIndent">
-      </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
-    </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
-  </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.drivers.profiles.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> ref=</span><span class="tokenAttrValue">"k.profiles.attribute"</span><span class="tokenElement">/></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
                                  </tr>
                               </table>
@@ -60251,7 +59900,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id463"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwareconfig.HWversion.attribute</span></div>
+      </table><a id="id462"></a><div class="componentTitle">Attribute Group <span class="qname">k.arch.fallback.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -60270,25 +59919,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id463" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id463');"
+                           <div class="floatRight"><input id="button_diagram_id462" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id462');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id463" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html85.jpeg" usemap="#kiwi_46_html85" /><map name="kiwi_46_html85" id="kiwi_46_html85">
-                                 <area alt="kiwi0.tmp#id464" href="kiwi0.html#id464" coords="276,0,395,42" /></map></div>
+                           <div id="diagram_id462" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html221.jpeg"
+                                   usemap="#kiwi_46_html221" /><map name="kiwi_46_html221" id="kiwi_46_html221">
+                                 <area alt="kiwi0.tmp#id463" href="kiwi0.html#id463" coords="209,0,320,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id463" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id462" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id463');"
+                                     onclick="switchState('attributes_id462');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id463" style="display:block">
+                           <div id="attributes_id462" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -60301,9 +59951,104 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id464" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">HWversion</a></b></td>
-                                    <td><b>xs:integer</b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id463" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">fallback</a></b></td>
+                                    <td><b>xs:IDREF</b></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td>required</td>
+                                    <td>
+                                       <div class="annotation"></div>
+                                    </td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Source</b></div>
+                           <div class="floatRight"><input id="button_source_id462" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id462');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="source_id462" style="display:block">
+                              <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
+                                     class="preWrapContainer">
+                                 <tr>
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.arch.fallback.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"fallback"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:IDREF"</span><span class="tokenElement">/></span><span class="tokenIndent">
+</span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
+                                 </tr>
+                              </table>
+                           </div>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+            </td>
+            <td class="rt_lineRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_cornerBottomLeft"></td>
+            <td class="rt_lineBottom"></td>
+            <td class="rt_cornerBottomRight"></td>
+         </tr>
+      </table><a id="id464"></a><div class="componentTitle">Attribute Group <span class="qname">k.machine.arch.attribute</span></div>
+      <table class="rt">
+         <tr>
+            <td class="rt_cornerTopLeft"></td>
+            <td class="rt_lineTop"></td>
+            <td class="rt_cornerTopRight"></td>
+         </tr>
+         <tr>
+            <td class="rt_lineLeft"></td>
+            <td class="rt_content">
+               <table class="component">
+                  <tbody>
+                     <tr>
+                        <td class="firstColumn"><b>Namespace</b></td>
+                        <td>No namespace</td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Diagram</b></div>
+                           <div class="floatRight"><input id="button_diagram_id464" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id464');"
+                                     class="control" /></div>
+                        </td>
+                        <td class="diagram">
+                           <div id="diagram_id464" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html227.jpeg"
+                                   usemap="#kiwi_46_html227" /><map name="kiwi_46_html227" id="kiwi_46_html227">
+                                 <area alt="kiwi0.tmp#id465" href="kiwi0.html#id465" coords="213,0,403,42" /></map></div>
+                        </td>
+                     </tr>
+                     <tr>
+                        <td class="firstColumn">
+                           <div class="floatLeft"><b>Attributes</b></div>
+                           <div class="floatRight"><input id="button_attributes_id464" type="image" src="images/button_minus.gif"
+                                     value="-"
+                                     onclick="switchState('attributes_id464');"
+                                     class="control" /></div>
+                        </td>
+                        <td>
+                           <div id="attributes_id464" style="display:block">
+                              <table class="attributesTable">
+                                 <thead>
+                                    <tr>
+                                       <th>QName</th>
+                                       <th>Type</th>
+                                       <th>Fixed</th>
+                                       <th>Default</th>
+                                       <th>Use</th>
+                                       <th>Annotation</th>
+                                    </tr>
+                                 </thead>
+                                 <tr>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id465" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></td>
+                                    <td>restriction of <b>xs:token</b></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -60312,7 +60057,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The virtual HW version number for the VMware configuration</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">the VM architecture type</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -60325,20 +60070,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id463" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id463');"
+                           <div class="floatRight"><input id="button_source_id464" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id464');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id463" style="display:block">
+                           <div id="source_id464" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwareconfig.HWversion.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"HWversion"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.machine.arch.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"arch"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The virtual HW version number for the VMware configuration</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the VM architecture type</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
+    </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
+        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"ix86"</span><span class="tokenElement">/></span><span class="tokenIndent">
+        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"x86_64"</span><span class="tokenElement">/></span><span class="tokenIndent">
+        </span><span class="tokenElement"><xs:enumeration</span><span class="tokenAttrName"> value=</span><span class="tokenAttrValue">"%arch"</span><span class="tokenElement">/></span><span class="tokenIndent">
+      </span><span class="tokenElement"></xs:restriction></span><span class="tokenIndent">
+    </span><span class="tokenElement"></xs:simpleType></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
                                  </tr>
@@ -60356,7 +60108,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id465"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwareconfig.guestOS.attribute</span></div>
+      </table><a id="id466"></a><div class="componentTitle">Attribute Group <span class="qname">k.machine.HWversion.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -60375,26 +60127,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id465" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id465');"
+                           <div class="floatRight"><input id="button_diagram_id466" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id466');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id465" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html102.jpeg"
-                                   usemap="#kiwi_46_html102" /><map name="kiwi_46_html102" id="kiwi_46_html102">
-                                 <area alt="kiwi0.tmp#id466" href="kiwi0.html#id466" coords="264,1,346,25" /></map></div>
+                           <div id="diagram_id466" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html172.jpeg"
+                                   usemap="#kiwi_46_html172" /><map name="kiwi_46_html172" id="kiwi_46_html172">
+                                 <area alt="kiwi0.tmp#id467" href="kiwi0.html#id467" coords="246,0,365,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id465" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id466" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id465');"
+                                     onclick="switchState('attributes_id466');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id465" style="display:block">
+                           <div id="attributes_id466" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -60407,9 +60159,9 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id466" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">guestOS</a></b></td>
-                                    <td></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id467" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">HWversion</a></b></td>
+                                    <td><b>xs:integer</b></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -60418,7 +60170,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">the virtual guestOS identification string for VMware</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The virtual HW version number for the VM configuration</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -60431,19 +60183,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id465" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id465');"
+                           <div class="floatRight"><input id="button_source_id466" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id466');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id465" style="display:block">
+                           <div id="source_id466" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwareconfig.guestOS.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"guestOS"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.machine.HWversion.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"HWversion"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:integer"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the virtual guestOS identification string for VMware</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The virtual HW version number for the VM configuration</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
@@ -60462,7 +60214,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id467"></a><div class="componentTitle">Attribute Group <span class="qname">k.vmwareconfig.usb.attribute</span></div>
+      </table><a id="id468"></a><div class="componentTitle">Attribute Group <span class="qname">k.machine.guestOS.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -60481,26 +60233,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id467" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id467');"
+                           <div class="floatRight"><input id="button_diagram_id468" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id468');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id467" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html277.jpeg"
-                                   usemap="#kiwi_46_html277" /><map name="kiwi_46_html277" id="kiwi_46_html277">
-                                 <area alt="kiwi0.tmp#id468" href="kiwi0.html#id468" coords="239,0,363,42" /></map></div>
+                           <div id="diagram_id468" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html157.jpeg"
+                                   usemap="#kiwi_46_html157" /><map name="kiwi_46_html157" id="kiwi_46_html157">
+                                 <area alt="kiwi0.tmp#id469" href="kiwi0.html#id469" coords="234,1,316,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id467" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id468" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id467');"
+                                     onclick="switchState('attributes_id468');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id467" style="display:block">
+                           <div id="attributes_id468" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -60513,9 +60265,9 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id468" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">usb</a></b></td>
-                                    <td><b>xs:boolean</b></td>
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id469" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">guestOS</a></b></td>
+                                    <td></td>
                                     <td></td>
                                     <td></td>
                                     <td>required</td>
@@ -60524,7 +60276,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">Activate/Deactivate usb controller for VMware</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">the virtual guestOS identification string for the VM</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -60537,19 +60289,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id467" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id467');"
+                           <div class="floatRight"><input id="button_source_id468" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id468');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id467" style="display:block">
+                           <div id="source_id468" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.vmwareconfig.usb.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
-  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"usb"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenAttrName"> type=</span><span class="tokenAttrValue">"xs:boolean"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.machine.guestOS.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+  </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"guestOS"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">Activate/Deactivate usb controller for VMware</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">the virtual guestOS identification string for the VM</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
@@ -60568,7 +60320,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id469"></a><div class="componentTitle">Attribute Group <span class="qname">k.xenconfig.memory.attribute</span></div>
+      </table><a id="id470"></a><div class="componentTitle">Attribute Group <span class="qname">k.machine.memory.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -60587,26 +60339,26 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id469" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id469');"
+                           <div class="floatRight"><input id="button_diagram_id470" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id470');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id469" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html185.jpeg"
-                                   usemap="#kiwi_46_html185" /><map name="kiwi_46_html185" id="kiwi_46_html185">
-                                 <area alt="kiwi0.tmp#id470" href="kiwi0.html#id470" coords="242,1,323,25" /></map></div>
+                           <div id="diagram_id470" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html193.jpeg"
+                                   usemap="#kiwi_46_html193" /><map name="kiwi_46_html193" id="kiwi_46_html193">
+                                 <area alt="kiwi0.tmp#id471" href="kiwi0.html#id471" coords="233,1,314,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id469" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id470" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id469');"
+                                     onclick="switchState('attributes_id470');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id469" style="display:block">
+                           <div id="attributes_id470" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -60619,7 +60371,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id470" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id471" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">memory</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -60630,7 +60382,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The memory setup for the Xen guest.</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The memory setup for the guest VM.</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -60643,19 +60395,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id469" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id469');"
+                           <div class="floatRight"><input id="button_source_id470" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id470');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id469" style="display:block">
+                           <div id="source_id470" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.xenconfig.memory.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.machine.memory.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"memory"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The memory setup for the Xen guest.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The memory setup for the guest VM.</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
   </span><span class="tokenElement"></xs:attribute></span><span class="tokenIndent">
 </span><span class="tokenElement"></xs:attributeGroup></span></pre></td>
@@ -60674,7 +60426,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id471"></a><div class="componentTitle">Attribute Group <span class="qname">k.xenconfig.domain.attribute</span></div>
+      </table><a id="id472"></a><div class="componentTitle">Attribute Group <span class="qname">k.machine.domain.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -60693,26 +60445,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id471" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id471');"
+                           <div class="floatRight"><input id="button_diagram_id472" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id472');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id471" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html266.jpeg"
-                                   usemap="#kiwi_46_html266" /><map name="kiwi_46_html266" id="kiwi_46_html266">
-                                 <area alt="kiwi0.tmp#id472" href="kiwi0.html#id472" coords="238,0,428,42" /></map></div>
+                           <div id="diagram_id472" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html96.jpeg" usemap="#kiwi_46_html96" /><map name="kiwi_46_html96" id="kiwi_46_html96">
+                                 <area alt="kiwi0.tmp#id473" href="kiwi0.html#id473" coords="229,0,419,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id471" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id472" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id471');"
+                                     onclick="switchState('attributes_id472');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id471" style="display:block">
+                           <div id="attributes_id472" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -60725,7 +60476,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id472" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id473" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">domain</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -60736,7 +60487,7 @@
                                           <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                                  class="preWrapContainer">
                                              <tr>
-                                                <td width="100%"><pre><span class="tokenText">The type of Xen domain to create (dom0 or domU)</span></pre></td>
+                                                <td width="100%"><pre><span class="tokenText">The domain setup for the VM (xen only)</span></pre></td>
                                              </tr>
                                           </table>
                                        </div>
@@ -60749,19 +60500,19 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id471" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id471');"
+                           <div class="floatRight"><input id="button_source_id472" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id472');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id471" style="display:block">
+                           <div id="source_id472" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
-                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.xenconfig.domain.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
+                                    <td width="100%"><pre><span class="tokenElement"><xs:attributeGroup</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"k.machine.domain.attribute"</span><span class="tokenElement">></span><span class="tokenIndent">
   </span><span class="tokenElement"><xs:attribute</span><span class="tokenAttrName"> name=</span><span class="tokenAttrValue">"domain"</span><span class="tokenAttrName"> use=</span><span class="tokenAttrValue">"required"</span><span class="tokenElement">></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:annotation</span><span class="tokenElement">></span><span class="tokenIndent">
-      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The type of Xen domain to create (dom0 or domU)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
+      </span><span class="tokenElement"><xs:documentation</span><span class="tokenElement">></span><span class="tokenText" style="white-space:normal">The domain setup for the VM (xen only)</span><span class="tokenElement"></xs:documentation></span><span class="tokenIndent">
     </span><span class="tokenElement"></xs:annotation></span><span class="tokenIndent">
     </span><span class="tokenElement"><xs:simpleType</span><span class="tokenElement">></span><span class="tokenIndent">
       </span><span class="tokenElement"><xs:restriction</span><span class="tokenAttrName"> base=</span><span class="tokenAttrValue">"xs:token"</span><span class="tokenElement">></span><span class="tokenIndent">
@@ -60786,7 +60537,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id473"></a><div class="componentTitle">Attribute Group <span class="qname">k.packages.profiles.attribute</span></div>
+      </table><a id="id474"></a><div class="componentTitle">Attribute Group <span class="qname">k.packages.profiles.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -60805,25 +60556,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id473" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id473');"
+                           <div class="floatRight"><input id="button_diagram_id474" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id474');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id473" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html53.jpeg" usemap="#kiwi_46_html53" /><map name="kiwi_46_html53" id="kiwi_46_html53">
-                                 <area alt="kiwi0.tmp#id474" href="kiwi0.html#id474" coords="235,1,313,25" /></map></div>
+                           <div id="diagram_id474" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html81.jpeg" usemap="#kiwi_46_html81" /><map name="kiwi_46_html81" id="kiwi_46_html81">
+                                 <area alt="kiwi0.tmp#id475" href="kiwi0.html#id475" coords="235,1,313,25" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id473" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id474" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id473');"
+                                     onclick="switchState('attributes_id474');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id473" style="display:block">
+                           <div id="attributes_id474" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -60836,7 +60587,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id474" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id475" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -60853,12 +60604,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id473" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id473');"
+                           <div class="floatRight"><input id="button_source_id474" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id474');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id473" style="display:block">
+                           <div id="source_id474" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -60880,7 +60631,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id475"></a><div class="componentTitle">Attribute Group <span class="qname">k.packages.patternType.attribute</span></div>
+      </table><a id="id476"></a><div class="componentTitle">Attribute Group <span class="qname">k.packages.patternType.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -60899,26 +60650,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id475" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id475');"
+                           <div class="floatRight"><input id="button_diagram_id476" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id476');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id475" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html124.jpeg"
-                                   usemap="#kiwi_46_html124" /><map name="kiwi_46_html124" id="kiwi_46_html124">
-                                 <area alt="kiwi0.tmp#id476" href="kiwi0.html#id476" coords="259,0,449,42" /></map></div>
+                           <div id="diagram_id476" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html23.jpeg" usemap="#kiwi_46_html23" /><map name="kiwi_46_html23" id="kiwi_46_html23">
+                                 <area alt="kiwi0.tmp#id477" href="kiwi0.html#id477" coords="259,0,449,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id475" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id476" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id475');"
+                                     onclick="switchState('attributes_id476');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id475" style="display:block">
+                           <div id="attributes_id476" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -60931,7 +60681,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id476" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id477" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">patternType</a></b></td>
                                     <td>restriction of <b>xs:token</b></td>
                                     <td></td>
@@ -60948,12 +60698,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id475" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id475');"
+                           <div class="floatRight"><input id="button_source_id476" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id476');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id475" style="display:block">
+                           <div id="source_id476" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -60982,7 +60732,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id477"></a><div class="componentTitle">Attribute Group <span class="qname">k.preferences.profiles.attribute</span></div>
+      </table><a id="id478"></a><div class="componentTitle">Attribute Group <span class="qname">k.preferences.profiles.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -61001,27 +60751,27 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id477" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id477');"
+                           <div class="floatRight"><input id="button_diagram_id478" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id478');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id477" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html169.jpeg"
-                                   usemap="#kiwi_46_html169" /><map name="kiwi_46_html169" id="kiwi_46_html169">
-                                 <area alt="kiwi0.tmp#id344" href="kiwi0.html#id344" coords="263,44,341,68" />
-                                 <area alt="kiwi0.tmp#id343" href="kiwi0.html#id343" coords="252,3,406,29" /></map></div>
+                           <div id="diagram_id478" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html196.jpeg"
+                                   usemap="#kiwi_46_html196" /><map name="kiwi_46_html196" id="kiwi_46_html196">
+                                 <area alt="kiwi0.tmp#id337" href="kiwi0.html#id337" coords="263,44,341,68" />
+                                 <area alt="kiwi0.tmp#id336" href="kiwi0.html#id336" coords="252,3,406,29" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id477" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id478" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id477');"
+                                     onclick="switchState('attributes_id478');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id477" style="display:block">
+                           <div id="attributes_id478" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -61034,7 +60784,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id344" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id337" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></td>
                                     <td></td>
                                     <td></td>
@@ -61058,12 +60808,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id477" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id477');"
+                           <div class="floatRight"><input id="button_source_id478" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id478');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id477" style="display:block">
+                           <div id="source_id478" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -61085,7 +60835,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id478"></a><div class="componentTitle">Attribute Group <span class="qname">k.users.id.attribute</span></div>
+      </table><a id="id479"></a><div class="componentTitle">Attribute Group <span class="qname">k.users.id.attribute</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -61104,26 +60854,25 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Diagram</b></div>
-                           <div class="floatRight"><input id="button_diagram_id478" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('diagram_id478');"
+                           <div class="floatRight"><input id="button_diagram_id479" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('diagram_id479');"
                                      class="control" /></div>
                         </td>
                         <td class="diagram">
-                           <div id="diagram_id478" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html274.jpeg"
-                                   usemap="#kiwi_46_html274" /><map name="kiwi_46_html274" id="kiwi_46_html274">
-                                 <area alt="kiwi0.tmp#id479" href="kiwi0.html#id479" coords="184,0,370,42" /></map></div>
+                           <div id="diagram_id479" style="display:block"><img alt="Diagram" border="0" src="images/kiwi.html38.jpeg" usemap="#kiwi_46_html38" /><map name="kiwi_46_html38" id="kiwi_46_html38">
+                                 <area alt="kiwi0.tmp#id480" href="kiwi0.html#id480" coords="184,0,370,42" /></map></div>
                         </td>
                      </tr>
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Attributes</b></div>
-                           <div class="floatRight"><input id="button_attributes_id478" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_attributes_id479" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('attributes_id478');"
+                                     onclick="switchState('attributes_id479');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="attributes_id478" style="display:block">
+                           <div id="attributes_id479" style="display:block">
                               <table class="attributesTable">
                                  <thead>
                                     <tr>
@@ -61136,7 +60885,7 @@
                                     </tr>
                                  </thead>
                                  <tr>
-                                    <td class="firstColumn"><b><a href="kiwi0.html#id479" target="mainFrame" title="No namespace"
+                                    <td class="firstColumn"><b><a href="kiwi0.html#id480" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">id</a></b></td>
                                     <td><b>xs:nonNegativeInteger</b></td>
                                     <td></td>
@@ -61160,12 +60909,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id478" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id478');"
+                           <div class="floatRight"><input id="button_source_id479" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id479');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id478" style="display:block">
+                           <div id="source_id479" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
diff --git a/doc/schema/kiwi1.html b/doc/schema/kiwi1.html
index 76e948f..388aeea 100644
--- a/doc/schema/kiwi1.html
+++ b/doc/schema/kiwi1.html
@@ -7,19 +7,19 @@
       <link rel="stylesheet" href="xsdDocHtml.css" type="text/css" /><script type="text/javascript">
          <!--
         var propertiesBoxes= new Array('properties_id1', 
-				'properties_id11', 
-				'properties_id13');
+				'properties_id12', 
+				'properties_id14');
 
         
-        var usedByBoxes= new Array('usedBy_id11', 
-				'usedBy_id13');
+        var usedByBoxes= new Array('usedBy_id12', 
+				'usedBy_id14');
 
-        var sourceBoxes= new Array('source_id11', 
-				'source_id13');
+        var sourceBoxes= new Array('source_id12', 
+				'source_id14');
 
         
         
-        var annotationBoxes= new Array('annotations_id11');
+        var annotationBoxes= new Array('annotations_id12');
 
         
         
@@ -339,7 +339,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id11"></a><div class="componentTitle">Attribute <span class="qname">@xsi:noNamespaceSchemaLocation</span></div>
+      </table><a id="id12"></a><div class="componentTitle">Attribute <span class="qname">@xsi:noNamespaceSchemaLocation</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -358,13 +358,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Annotations</b></div>
-                           <div class="floatRight"><input id="button_annotations_id11" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_annotations_id12" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('annotations_id11');"
+                                     onclick="switchState('annotations_id12');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="annotations_id11" style="display:block">
+                           <div id="annotations_id12" style="display:block">
                               <div class="annotation">
                                  <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                         class="preWrapContainer">
@@ -383,13 +383,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id11" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id12" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id11');"
+                                     onclick="switchState('properties_id12');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id11" style="display:block">
+                           <div id="properties_id12" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -404,17 +404,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id11" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id11');"
+                           <div class="floatRight"><input id="button_usedBy_id12" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id12');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id11" style="display:block">
+                           <div id="usedBy_id12" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Groups </td>
-                                    <td><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b>, <b><a href="kiwi0.html#id10" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b>, <b><a href="kiwi0.html#id11" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.noNamespaceSchemaLocation.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -424,12 +424,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id11" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id11');"
+                           <div class="floatRight"><input id="button_source_id12" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id12');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id11" style="display:block">
+                           <div id="source_id12" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
@@ -453,7 +453,7 @@
             <td class="rt_lineBottom"></td>
             <td class="rt_cornerBottomRight"></td>
          </tr>
-      </table><a id="id13"></a><div class="componentTitle">Attribute <span class="qname">@xsi:schemaLocation</span></div>
+      </table><a id="id14"></a><div class="componentTitle">Attribute <span class="qname">@xsi:schemaLocation</span></div>
       <table class="rt">
          <tr>
             <td class="rt_cornerTopLeft"></td>
@@ -476,13 +476,13 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Properties</b></div>
-                           <div class="floatRight"><input id="button_properties_id13" type="image" src="images/button_minus.gif"
+                           <div class="floatRight"><input id="button_properties_id14" type="image" src="images/button_minus.gif"
                                      value="-"
-                                     onclick="switchState('properties_id13');"
+                                     onclick="switchState('properties_id14');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="properties_id13" style="display:block">
+                           <div id="properties_id14" style="display:block">
                               <table class="propertiesTable">
                                  <tr>
                                     <td class="firstColumn">content:
@@ -497,17 +497,17 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Used by</b></div>
-                           <div class="floatRight"><input id="button_usedBy_id13" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('usedBy_id13');"
+                           <div class="floatRight"><input id="button_usedBy_id14" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('usedBy_id14');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="usedBy_id13" style="display:block">
+                           <div id="usedBy_id14" style="display:block">
                               <table class="usedByTable">
                                  <tr>
                                     <td class="firstColumn">Attribute Groups </td>
-                                    <td><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b>, <b><a href="kiwi0.html#id12" target="mainFrame" title="No namespace"
+                                    <td><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b>, <b><a href="kiwi0.html#id13" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.schemaLocation.attribute</a></b></td>
                                  </tr>
                               </table>
@@ -517,12 +517,12 @@
                      <tr>
                         <td class="firstColumn">
                            <div class="floatLeft"><b>Source</b></div>
-                           <div class="floatRight"><input id="button_source_id13" type="image" src="images/button_minus.gif" value="-"
-                                     onclick="switchState('source_id13');"
+                           <div class="floatRight"><input id="button_source_id14" type="image" src="images/button_minus.gif" value="-"
+                                     onclick="switchState('source_id14');"
                                      class="control" /></div>
                         </td>
                         <td>
-                           <div id="source_id13" style="display:block">
+                           <div id="source_id14" style="display:block">
                               <table style="table-layout:fixed;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space: -o-pre-wrap;word-wrap: break-word;_white-space:pre;"
                                      class="preWrapContainer">
                                  <tr>
diff --git a/doc/schema/kiwi_indexList.html b/doc/schema/kiwi_indexList.html
index 4fb6030..05c6858 100644
--- a/doc/schema/kiwi_indexList.html
+++ b/doc/schema/kiwi_indexList.html
@@ -266,180 +266,176 @@
                                     
                                  </div>
                                  <div id="boxIdNamespace1Element" style="display:block">
-                                    <div><b><a href="kiwi0.html#id213" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id206" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></div>
-                                    <div><b><a href="kiwi0.html#id212" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id205" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">architectures</a></b></div>
-                                    <div><b><a href="kiwi0.html#id324" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id317" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">archive</a></b></div>
-                                    <div><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id30" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">author</a></b></div>
-                                    <div><b><a href="kiwi0.html#id198" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id191" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">boot-theme</a></b></div>
-                                    <div><b><a href="kiwi0.html#id267" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id260" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">chroot</a></b></div>
-                                    <div><b><a href="kiwi0.html#id95" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id98" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">configuration</a></b></div>
-                                    <div><b><a href="kiwi0.html#id30" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id31" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">contact</a></b></div>
-                                    <div><b><a href="kiwi0.html#id201" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id194" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultbaseroot</a></b></div>
-                                    <div><b><a href="kiwi0.html#id199" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id192" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultdestination</a></b></div>
-                                    <div><b><a href="kiwi0.html#id200" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id193" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultroot</a></b></div>
-                                    <div><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b></div>
-                                    <div><b><a href="kiwi0.html#id288" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id281" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">drivers</a></b></div>
-                                    <div><b><a href="kiwi0.html#id38" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2accountnr</a></b></div>
                                     <div><b><a href="kiwi0.html#id39" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2accountnr</a></b></div>
+                                    <div><b><a href="kiwi0.html#id40" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2certfile</a></b></div>
-                                    <div><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id38" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2config</a></b></div>
-                                    <div><b><a href="kiwi0.html#id40" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id41" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2privatekeyfile</a></b></div>
-                                    <div><b><a href="kiwi0.html#id113" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b></div>
                                     <div><b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b></div>
+                                    <div><b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">file</a></b></div>
-                                    <div><b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id314" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ignore</a></b></div>
-                                    <div><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></div>
-                                    <div><b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">initrd</a></b></div>
-                                    <div><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instrepo</a></b></div>
-                                    <div><b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instsource</a></b></div>
-                                    <div><b><a href="kiwi0.html#id73" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id76" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">kernel</a></b></div>
-                                    <div><b><a href="kiwi0.html#id195" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id188" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">keytable</a></b></div>
-                                    <div><b><a href="kiwi0.html#id197" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id190" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">locale</a></b></div>
-                                    <div><b><a href="kiwi0.html#id41" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id42" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvmvolumes</a></b></div>
-                                    <div><b><a href="kiwi0.html#id246" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">machine</a></b></div>
+                                    <div><b><a href="kiwi0.html#id239" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metadata</a></b></div>
-                                    <div><b><a href="kiwi0.html#id258" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id251" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metafile</a></b></div>
-                                    <div><b><a href="kiwi0.html#id58" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id59" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-boot-title</a></b></div>
-                                    <div><b><a href="kiwi0.html#id67" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id70" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-dumphalt</a></b></div>
-                                    <div><b><a href="kiwi0.html#id56" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id57" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-home</a></b></div>
-                                    <div><b><a href="kiwi0.html#id59" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id66" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-inplace-recovery</a></b></div>
+                                    <div><b><a href="kiwi0.html#id60" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-kiwi-initrd</a></b></div>
-                                    <div><b><a href="kiwi0.html#id54" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id55" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-partition-install</a></b></div>
-                                    <div><b><a href="kiwi0.html#id65" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id68" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-reboot</a></b></div>
-                                    <div><b><a href="kiwi0.html#id62" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id63" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recovery</a></b></div>
-                                    <div><b><a href="kiwi0.html#id64" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id65" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recoveryID</a></b></div>
-                                    <div><b><a href="kiwi0.html#id52" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id53" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swap</a></b></div>
-                                    <div><b><a href="kiwi0.html#id61" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id62" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swapsize</a></b></div>
-                                    <div><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id52" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-systemsize</a></b></div>
-                                    <div><b><a href="kiwi0.html#id69" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id72" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-unattended</a></b></div>
-                                    <div><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></div>
-                                    <div><b><a href="kiwi0.html#id309" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id302" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensusePattern</a></b></div>
-                                    <div><b><a href="kiwi0.html#id317" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id310" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensuseProduct</a></b></div>
-                                    <div><b><a href="kiwi0.html#id302" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id295" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">package</a></b></div>
-                                    <div><b><a href="kiwi0.html#id187" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id180" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packagemanager</a></b></div>
-                                    <div><b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packages</a></b></div>
-                                    <div><b><a href="kiwi0.html#id76" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id79" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partition</a></b></div>
-                                    <div><b><a href="kiwi0.html#id75" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id78" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partitions</a></b></div>
-                                    <div><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id125" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">persistent</a></b></div>
-                                    <div><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></div>
-                                    <div><b><a href="kiwi0.html#id227" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id220" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productinfo</a></b></div>
-                                    <div><b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id218" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoption</a></b></div>
-                                    <div><b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id217" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoptions</a></b></div>
-                                    <div><b><a href="kiwi0.html#id229" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id222" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productvar</a></b></div>
-                                    <div><b><a href="kiwi0.html#id205" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id198" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profile</a></b></div>
-                                    <div><b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id197" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></div>
-                                    <div><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b></div>
-                                    <div><b><a href="kiwi0.html#id247" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id240" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackage</a></b></div>
-                                    <div><b><a href="kiwi0.html#id270" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id263" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackages</a></b></div>
-                                    <div><b><a href="kiwi0.html#id293" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id286" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repository</a></b></div>
-                                    <div><b><a href="kiwi0.html#id220" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id213" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">requiredarch</a></b></div>
-                                    <div><b><a href="kiwi0.html#id313" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id306" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rhelGroup</a></b></div>
-                                    <div><b><a href="kiwi0.html#id189" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id182" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-check-signatures</a></b></div>
-                                    <div><b><a href="kiwi0.html#id191" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id184" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-excludedocs</a></b></div>
-                                    <div><b><a href="kiwi0.html#id193" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id186" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-force</a></b></div>
-                                    <div><b><a href="kiwi0.html#id107" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id110" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b></div>
-                                    <div><b><a href="kiwi0.html#id233" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></div>
-                                    <div><b><a href="kiwi0.html#id31" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id32" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">specification</a></b></div>
-                                    <div><b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id114" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">split</a></b></div>
-                                    <div><b><a href="kiwi0.html#id112" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id115" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">temporary</a></b></div>
-                                    <div><b><a href="kiwi0.html#id72" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id75" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timeout</a></b></div>
-                                    <div><b><a href="kiwi0.html#id196" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id189" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timezone</a></b></div>
-                                    <div><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></div>
-                                    <div><b><a href="kiwi0.html#id87" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id90" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">union</a></b></div>
-                                    <div><b><a href="kiwi0.html#id272" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id265" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">user</a></b></div>
-                                    <div><b><a href="kiwi0.html#id271" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id264" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">users</a></b></div>
-                                    <div><b><a href="kiwi0.html#id186" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id179" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">version</a></b></div>
-                                    <div><b><a href="kiwi0.html#id136" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwarecdrom</a></b></div>
-                                    <div><b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwareconfig</a></b></div>
-                                    <div><b><a href="kiwi0.html#id130" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwaredisk</a></b></div>
-                                    <div><b><a href="kiwi0.html#id122" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwarenic</a></b></div>
-                                    <div><b><a href="kiwi0.html#id42" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id134" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmdisk</a></b></div>
+                                    <div><b><a href="kiwi0.html#id141" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmdvd</a></b></div>
+                                    <div><b><a href="kiwi0.html#id127" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmnic</a></b></div>
+                                    <div><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volume</a></b></div>
-                                    <div><b><a href="kiwi0.html#id154" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenbridge</a></b></div>
-                                    <div><b><a href="kiwi0.html#id149" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenconfig</a></b></div>
-                                    <div><b><a href="kiwi0.html#id150" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xendisk</a></b></div>
                                  </div>
                               </td>
                               <td class="rt_lineRight"></td>
@@ -465,29 +461,33 @@
                                     
                                  </div>
                                  <div id="boxIdNamespace1Simple_Type" style="display:block">
-                                    <div><b><a href="kiwi0.html#id68" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id4" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image-name</a></b></div>
+                                    <div><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-dumphalt.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id57" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id58" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-home.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id60" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id67" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-inplace-recovery.content</a></b></div>
+                                    <div><b><a href="kiwi0.html#id61" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-kiwi-initrd.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id55" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id56" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-partition-install.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id66" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id69" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-reboot.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id63" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id64" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-recovery.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id53" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id54" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-swap.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id70" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id73" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-unattended.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id188" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id181" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packagemanager.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id190" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id183" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rpm-check-signatures.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id192" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id185" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rpm-excludedocs.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id194" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id187" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rpm-force.content</a></b></div>
                                     <div><b><a href="kiwi0.html#id2" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size-type</a></b></div>
@@ -518,7 +518,7 @@
                                     
                                  </div>
                                  <div id="boxIdNamespace1Complex_Type" style="display:block">
-                                    <div><b><a href="kiwi0.html#id232" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source</a></b></div>
                                  </div>
                               </td>
@@ -545,384 +545,378 @@
                                     
                                  </div>
                                  <div id="boxIdNamespace1Attribute_Group" style="display:block">
-                                    <div><b><a href="kiwi0.html#id214" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id207" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id339" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id332" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id459" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id462" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.fallback.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id215" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id208" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.id.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id218" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id325" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id318" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id375" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id368" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.bootinclude.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id326" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id319" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id337" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id330" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.bootdelete.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id335" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id328" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.bootinclude.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id268" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id261" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.chroot.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id349" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id342" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id96" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id99" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id100" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id103" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.dest.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id97" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id100" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.source.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id32" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id33" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id341" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id334" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id33" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id34" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.type.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id101" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id104" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.dest.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id8" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id9" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.displayname.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id289" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id282" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id458" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id461" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.profiles.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id290" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id283" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.type.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id114" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id117" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.except.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id115" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id118" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.except.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id350" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id343" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id117" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id122" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id118" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id123" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id216" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id209" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.id.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id322" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id315" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.ignore.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id323" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id316" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.ignore.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id7" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id8" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.displayname.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id20" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id21" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.id</a></b></div>
-                                    <div><b><a href="kiwi0.html#id14" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id15" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.inherit.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id18" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id19" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.kiwirevision.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id4" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id5" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id10" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id11" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.noNamespaceSchemaLocation.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id12" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id13" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.schemaLocation.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id16" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id17" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.schemaversion.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id238" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.imagename.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id353" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id346" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.local.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id239" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id232" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id234" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.priority.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id352" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id345" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.pwd.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id351" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id344" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.username.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id48" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id49" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.lvmvolumes.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id442" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id439" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.lvmvolumes.lvmgroup.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id259" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id466" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.HWversion.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id464" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.arch.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.attlist</a></b></div>
+                                    <div><b><a href="kiwi0.html#id472" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.domain.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id468" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.guestOS.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id470" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.memory.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id252" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id262" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id255" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.script.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id265" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id258" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.target.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id260" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id253" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.url.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id5" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id119" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id355" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id348" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id310" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id311" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id304" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id357" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id350" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id318" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id311" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id319" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id312" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id371" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id364" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id374" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id367" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.bootdelete.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id373" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id366" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.bootinclude.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id304" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id297" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id372" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id365" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.replaces.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id328" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id475" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id476" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.patternType.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id473" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id474" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.profiles.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id329" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id322" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.type.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id379" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id372" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.mountpoint.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id83" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.number.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id378" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id371" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.size.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id381" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id374" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.target.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id78" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id81" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.type.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id85" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id88" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partitions.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id376" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id369" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partitions.device.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id236" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id229" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.path.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id202" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id195" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.preferences.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id477" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id478" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.preferences.profiles.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id228" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id221" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productinfo.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id219" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productoption.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id230" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id223" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productvar.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id206" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id199" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id208" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id201" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.description.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id383" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id376" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.import.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id207" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id200" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id343" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id336" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profiles.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id278" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id271" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pwd.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id104" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id107" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id456" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id459" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.blocksize.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id454" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id457" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.server.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id333" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id326" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.replaces.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id361" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id354" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.addarch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id358" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id351" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id359" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id352" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.forcerepo.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id367" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id360" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.medium.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id249" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id242" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id365" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id358" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.onlyarch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id363" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id356" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.removearch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id370" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id363" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.script.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id369" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id362" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.source.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id388" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id381" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.alias.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id390" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id383" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.priority.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id385" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id378" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.profiles.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id386" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id379" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.status.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id295" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id288" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.type.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id221" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id214" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.requiredarch.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id222" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id215" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.requiredarch.ref.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id356" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id349" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id314" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id307" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id315" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id308" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id263" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id256" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.script.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id394" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id387" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.additive.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id108" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id345" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id338" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id392" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id385" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.unit.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id234" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id227" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id98" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id101" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id235" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id228" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source.path.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id400" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id393" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.baseroot.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id406" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id399" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.boot.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id404" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id397" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootkernel.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id418" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id411" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootloader.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id402" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id395" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootprofile.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id408" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id401" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.checkprebuilt.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id420" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id413" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.compressed.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id426" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id419" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.filesystem.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id412" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id405" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.flags.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id432" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id425" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.format.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id396" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id389" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsnocheck.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id428" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id421" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsreadonly.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id430" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id423" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsreadwrite.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id414" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id407" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.hybrid.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id416" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id409" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.hybridpersistent.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id163" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id154" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.image.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id436" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id427" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.installiso.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id429" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.installstick.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id433" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.kernelcmdline.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id424" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id417" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.luks.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id398" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id391" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.lvm.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id434" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id431" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.primary.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id422" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id415" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.vga.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id410" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id403" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.volid.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id88" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id91" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id89" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id92" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.ro.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id91" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id94" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.rw.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id93" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id96" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.type.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id281" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id274" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.home.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id444" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id441" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.id.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id274" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id267" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id277" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id270" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.pwd.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id448" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id445" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.pwdformat</a></b></div>
-                                    <div><b><a href="kiwi0.html#id446" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id443" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.realname.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id450" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id447" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.shell.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id347" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id340" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.username.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id284" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id277" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id285" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id278" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.group.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id478" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id479" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.id.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id137" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.attlist</a></b></div>
+                                    <div><b><a href="kiwi0.html#id135" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.attlist</a></b></div>
+                                    <div><b><a href="kiwi0.html#id136" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.controller.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id455" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.device.attribute</a></b></div>
                                     <div><b><a href="kiwi0.html#id138" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.controller.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id140" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.id.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id463" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.HWversion.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id461" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.arch.attribute</a></b></div>
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.id.attribute</a></b></div>
                                     <div><b><a href="kiwi0.html#id142" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id465" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.guestOS.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.memory.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id467" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.usb.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id131" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id132" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.controller.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id134" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.id.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id123" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id124" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.driver.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.interface.attribute</a></b></div>
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.attlist</a></b></div>
+                                    <div><b><a href="kiwi0.html#id143" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.controller.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id145" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.id.attribute</a></b></div>
                                     <div><b><a href="kiwi0.html#id128" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.mode.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.attlist</a></b></div>
+                                    <div><b><a href="kiwi0.html#id449" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.driver.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id130" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.interface.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id453" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.mac.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id451" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.mode.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id44" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id438" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id435" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.freespace.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id46" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id47" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id440" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id437" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.size.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id155" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id452" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.mac.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id157" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id159" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id471" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.domain.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id469" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.memory.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id151" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xendisk.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id152" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xendisk.device.attribute</a></b></div>
                                  </div>
                               </td>
                               <td class="rt_lineRight"></td>
@@ -957,10 +951,10 @@
                                     
                                  </div>
                                  <div id="boxIdNamespace2Attribute" style="display:block">
-                                    <div><b><a href="kiwi1.html#id11" target="mainFrame"
+                                    <div><b><a href="kiwi1.html#id12" target="mainFrame"
                                              title="http://www.w3.org/2001/XMLSchema-instance"
                                              onclick="updatePageTitle('Schema documentation for xsi.xsd')">@xsi:noNamespaceSchemaLocation</a></b></div>
-                                    <div><b><a href="kiwi1.html#id13" target="mainFrame"
+                                    <div><b><a href="kiwi1.html#id14" target="mainFrame"
                                              title="http://www.w3.org/2001/XMLSchema-instance"
                                              onclick="updatePageTitle('Schema documentation for xsi.xsd')">@xsi:schemaLocation</a></b></div>
                                  </div>
@@ -995,180 +989,176 @@
                               
                            </div>
                            <div id="Element" style="display:block">
-                              <div><b><a href="kiwi0.html#id213" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id206" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></div>
-                              <div><b><a href="kiwi0.html#id212" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id205" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">architectures</a></b></div>
-                              <div><b><a href="kiwi0.html#id324" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id317" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">archive</a></b></div>
-                              <div><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id30" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">author</a></b></div>
-                              <div><b><a href="kiwi0.html#id198" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id191" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">boot-theme</a></b></div>
-                              <div><b><a href="kiwi0.html#id267" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id260" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">chroot</a></b></div>
-                              <div><b><a href="kiwi0.html#id95" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id98" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">configuration</a></b></div>
-                              <div><b><a href="kiwi0.html#id30" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id31" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">contact</a></b></div>
-                              <div><b><a href="kiwi0.html#id201" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id194" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultbaseroot</a></b></div>
-                              <div><b><a href="kiwi0.html#id199" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id192" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultdestination</a></b></div>
-                              <div><b><a href="kiwi0.html#id200" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id193" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultroot</a></b></div>
-                              <div><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b></div>
-                              <div><b><a href="kiwi0.html#id288" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id281" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">drivers</a></b></div>
-                              <div><b><a href="kiwi0.html#id38" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2accountnr</a></b></div>
                               <div><b><a href="kiwi0.html#id39" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2accountnr</a></b></div>
+                              <div><b><a href="kiwi0.html#id40" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2certfile</a></b></div>
-                              <div><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id38" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2config</a></b></div>
-                              <div><b><a href="kiwi0.html#id40" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id41" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2privatekeyfile</a></b></div>
-                              <div><b><a href="kiwi0.html#id113" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b></div>
                               <div><b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b></div>
+                              <div><b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">file</a></b></div>
-                              <div><b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id314" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ignore</a></b></div>
-                              <div><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></div>
-                              <div><b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">initrd</a></b></div>
-                              <div><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instrepo</a></b></div>
-                              <div><b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instsource</a></b></div>
-                              <div><b><a href="kiwi0.html#id73" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id76" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">kernel</a></b></div>
-                              <div><b><a href="kiwi0.html#id195" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id188" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">keytable</a></b></div>
-                              <div><b><a href="kiwi0.html#id197" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id190" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">locale</a></b></div>
-                              <div><b><a href="kiwi0.html#id41" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id42" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvmvolumes</a></b></div>
-                              <div><b><a href="kiwi0.html#id246" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">machine</a></b></div>
+                              <div><b><a href="kiwi0.html#id239" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metadata</a></b></div>
-                              <div><b><a href="kiwi0.html#id258" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id251" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metafile</a></b></div>
-                              <div><b><a href="kiwi0.html#id58" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id59" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-boot-title</a></b></div>
-                              <div><b><a href="kiwi0.html#id67" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id70" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-dumphalt</a></b></div>
-                              <div><b><a href="kiwi0.html#id56" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id57" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-home</a></b></div>
-                              <div><b><a href="kiwi0.html#id59" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id66" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-inplace-recovery</a></b></div>
+                              <div><b><a href="kiwi0.html#id60" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-kiwi-initrd</a></b></div>
-                              <div><b><a href="kiwi0.html#id54" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id55" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-partition-install</a></b></div>
-                              <div><b><a href="kiwi0.html#id65" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id68" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-reboot</a></b></div>
-                              <div><b><a href="kiwi0.html#id62" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id63" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recovery</a></b></div>
-                              <div><b><a href="kiwi0.html#id64" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id65" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recoveryID</a></b></div>
-                              <div><b><a href="kiwi0.html#id52" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id53" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swap</a></b></div>
-                              <div><b><a href="kiwi0.html#id61" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id62" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swapsize</a></b></div>
-                              <div><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id52" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-systemsize</a></b></div>
-                              <div><b><a href="kiwi0.html#id69" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id72" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-unattended</a></b></div>
-                              <div><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></div>
-                              <div><b><a href="kiwi0.html#id309" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id302" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensusePattern</a></b></div>
-                              <div><b><a href="kiwi0.html#id317" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id310" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensuseProduct</a></b></div>
-                              <div><b><a href="kiwi0.html#id302" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id295" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">package</a></b></div>
-                              <div><b><a href="kiwi0.html#id187" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id180" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packagemanager</a></b></div>
-                              <div><b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packages</a></b></div>
-                              <div><b><a href="kiwi0.html#id76" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id79" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partition</a></b></div>
-                              <div><b><a href="kiwi0.html#id75" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id78" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partitions</a></b></div>
-                              <div><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id125" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">persistent</a></b></div>
-                              <div><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></div>
-                              <div><b><a href="kiwi0.html#id227" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id220" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productinfo</a></b></div>
-                              <div><b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id218" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoption</a></b></div>
-                              <div><b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id217" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoptions</a></b></div>
-                              <div><b><a href="kiwi0.html#id229" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id222" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productvar</a></b></div>
-                              <div><b><a href="kiwi0.html#id205" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id198" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profile</a></b></div>
-                              <div><b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id197" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></div>
-                              <div><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b></div>
-                              <div><b><a href="kiwi0.html#id247" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id240" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackage</a></b></div>
-                              <div><b><a href="kiwi0.html#id270" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id263" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackages</a></b></div>
-                              <div><b><a href="kiwi0.html#id293" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id286" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repository</a></b></div>
-                              <div><b><a href="kiwi0.html#id220" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id213" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">requiredarch</a></b></div>
-                              <div><b><a href="kiwi0.html#id313" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id306" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rhelGroup</a></b></div>
-                              <div><b><a href="kiwi0.html#id189" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id182" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-check-signatures</a></b></div>
-                              <div><b><a href="kiwi0.html#id191" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id184" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-excludedocs</a></b></div>
-                              <div><b><a href="kiwi0.html#id193" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id186" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-force</a></b></div>
-                              <div><b><a href="kiwi0.html#id107" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id110" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b></div>
-                              <div><b><a href="kiwi0.html#id233" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></div>
-                              <div><b><a href="kiwi0.html#id31" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id32" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">specification</a></b></div>
-                              <div><b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id114" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">split</a></b></div>
-                              <div><b><a href="kiwi0.html#id112" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id115" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">temporary</a></b></div>
-                              <div><b><a href="kiwi0.html#id72" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id75" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timeout</a></b></div>
-                              <div><b><a href="kiwi0.html#id196" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id189" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timezone</a></b></div>
-                              <div><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></div>
-                              <div><b><a href="kiwi0.html#id87" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id90" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">union</a></b></div>
-                              <div><b><a href="kiwi0.html#id272" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id265" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">user</a></b></div>
-                              <div><b><a href="kiwi0.html#id271" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id264" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">users</a></b></div>
-                              <div><b><a href="kiwi0.html#id186" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id179" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">version</a></b></div>
-                              <div><b><a href="kiwi0.html#id136" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwarecdrom</a></b></div>
-                              <div><b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwareconfig</a></b></div>
-                              <div><b><a href="kiwi0.html#id130" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwaredisk</a></b></div>
-                              <div><b><a href="kiwi0.html#id122" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwarenic</a></b></div>
-                              <div><b><a href="kiwi0.html#id42" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id134" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmdisk</a></b></div>
+                              <div><b><a href="kiwi0.html#id141" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmdvd</a></b></div>
+                              <div><b><a href="kiwi0.html#id127" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmnic</a></b></div>
+                              <div><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volume</a></b></div>
-                              <div><b><a href="kiwi0.html#id154" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenbridge</a></b></div>
-                              <div><b><a href="kiwi0.html#id149" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenconfig</a></b></div>
-                              <div><b><a href="kiwi0.html#id150" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xendisk</a></b></div>
                            </div>
                         </td>
                         <td class="rt_lineRight"></td>
@@ -1194,29 +1184,33 @@
                               
                            </div>
                            <div id="Simple_Type" style="display:block">
-                              <div><b><a href="kiwi0.html#id68" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id4" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image-name</a></b></div>
+                              <div><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-dumphalt.content</a></b></div>
-                              <div><b><a href="kiwi0.html#id57" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id58" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-home.content</a></b></div>
-                              <div><b><a href="kiwi0.html#id60" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id67" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-inplace-recovery.content</a></b></div>
+                              <div><b><a href="kiwi0.html#id61" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-kiwi-initrd.content</a></b></div>
-                              <div><b><a href="kiwi0.html#id55" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id56" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-partition-install.content</a></b></div>
-                              <div><b><a href="kiwi0.html#id66" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id69" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-reboot.content</a></b></div>
-                              <div><b><a href="kiwi0.html#id63" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id64" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-recovery.content</a></b></div>
-                              <div><b><a href="kiwi0.html#id53" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id54" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-swap.content</a></b></div>
-                              <div><b><a href="kiwi0.html#id70" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id73" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-unattended.content</a></b></div>
-                              <div><b><a href="kiwi0.html#id188" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id181" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packagemanager.content</a></b></div>
-                              <div><b><a href="kiwi0.html#id190" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id183" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rpm-check-signatures.content</a></b></div>
-                              <div><b><a href="kiwi0.html#id192" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id185" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rpm-excludedocs.content</a></b></div>
-                              <div><b><a href="kiwi0.html#id194" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id187" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rpm-force.content</a></b></div>
                               <div><b><a href="kiwi0.html#id2" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size-type</a></b></div>
@@ -1247,7 +1241,7 @@
                               
                            </div>
                            <div id="Complex_Type" style="display:block">
-                              <div><b><a href="kiwi0.html#id232" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source</a></b></div>
                            </div>
                         </td>
@@ -1274,10 +1268,10 @@
                               
                            </div>
                            <div id="Attribute" style="display:block">
-                              <div><b><a href="kiwi1.html#id11" target="mainFrame"
+                              <div><b><a href="kiwi1.html#id12" target="mainFrame"
                                        title="http://www.w3.org/2001/XMLSchema-instance"
                                        onclick="updatePageTitle('Schema documentation for xsi.xsd')">@xsi:noNamespaceSchemaLocation</a></b></div>
-                              <div><b><a href="kiwi1.html#id13" target="mainFrame"
+                              <div><b><a href="kiwi1.html#id14" target="mainFrame"
                                        title="http://www.w3.org/2001/XMLSchema-instance"
                                        onclick="updatePageTitle('Schema documentation for xsi.xsd')">@xsi:schemaLocation</a></b></div>
                            </div>
@@ -1305,384 +1299,378 @@
                               
                            </div>
                            <div id="Attribute_Group" style="display:block">
-                              <div><b><a href="kiwi0.html#id214" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id207" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id339" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id332" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id459" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id462" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.fallback.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id215" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id208" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.id.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id218" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id325" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id318" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id375" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id368" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.bootinclude.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id326" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id319" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id337" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id330" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.bootdelete.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id335" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id328" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.bootinclude.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id268" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id261" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.chroot.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id349" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id342" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.arch.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id96" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id99" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id100" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id103" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.dest.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id97" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id100" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.source.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id32" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id33" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id341" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id334" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id33" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id34" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.type.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id101" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id104" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.dest.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id8" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id9" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.displayname.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id289" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id282" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id458" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id461" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.profiles.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id290" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id283" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.type.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id114" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id117" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.except.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id115" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id118" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.except.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id350" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id343" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.arch.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id117" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id122" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id118" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id123" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id216" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id209" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.id.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id322" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id315" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.ignore.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id323" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id316" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.ignore.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id7" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id8" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.displayname.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id20" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id21" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.id</a></b></div>
-                              <div><b><a href="kiwi0.html#id14" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id15" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.inherit.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id18" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id19" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.kiwirevision.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id4" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id5" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id10" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id11" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.noNamespaceSchemaLocation.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id12" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id13" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.schemaLocation.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id16" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id17" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.schemaversion.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id238" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.imagename.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id353" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id346" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.local.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id239" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id232" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id234" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.priority.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id352" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id345" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.pwd.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id351" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id344" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.username.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id48" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id49" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.lvmvolumes.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id442" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id439" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.lvmvolumes.lvmgroup.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id259" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id466" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.HWversion.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id464" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.arch.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.attlist</a></b></div>
+                              <div><b><a href="kiwi0.html#id472" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.domain.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id468" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.guestOS.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id470" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.memory.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id252" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id262" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id255" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.script.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id265" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id258" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.target.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id260" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id253" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.url.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id5" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id119" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id355" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id348" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.arch.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id310" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id311" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id304" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id357" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id350" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.arch.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id318" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id311" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id319" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id312" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id371" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id364" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.arch.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id374" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id367" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.bootdelete.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id373" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id366" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.bootinclude.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id304" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id297" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id372" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id365" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.replaces.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id328" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id475" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id476" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.patternType.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id473" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id474" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.profiles.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id329" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id322" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.type.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id379" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id372" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.mountpoint.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id83" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.number.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id378" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id371" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.size.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id381" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id374" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.target.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id78" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id81" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.type.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id85" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id88" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partitions.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id376" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id369" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partitions.device.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id236" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id229" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.path.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id202" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id195" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.preferences.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id477" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id478" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.preferences.profiles.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id228" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id221" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productinfo.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id219" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productoption.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id230" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id223" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productvar.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id206" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id199" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id208" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id201" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.description.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id383" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id376" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.import.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id207" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id200" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id343" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id336" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profiles.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id278" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id271" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pwd.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id104" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id107" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id456" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id459" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.blocksize.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id454" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id457" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.server.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id333" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id326" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.replaces.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id361" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id354" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.addarch.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id358" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id351" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.arch.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id359" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id352" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.forcerepo.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id367" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id360" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.medium.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id249" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id242" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id365" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id358" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.onlyarch.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id363" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id356" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.removearch.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id370" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id363" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.script.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id369" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id362" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.source.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id388" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id381" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.alias.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id390" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id383" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.priority.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id385" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id378" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.profiles.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id386" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id379" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.status.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id295" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id288" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.type.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id221" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id214" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.requiredarch.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id222" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id215" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.requiredarch.ref.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id356" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id349" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.arch.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id314" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id307" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id315" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id308" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id263" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id256" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.script.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id394" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id387" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.additive.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id108" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id345" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id338" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id392" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id385" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.unit.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id234" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id227" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id98" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id101" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id235" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id228" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source.path.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id400" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id393" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.baseroot.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id406" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id399" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.boot.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id404" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id397" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootkernel.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id418" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id411" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootloader.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id402" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id395" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootprofile.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id408" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id401" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.checkprebuilt.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id420" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id413" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.compressed.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id426" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id419" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.filesystem.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id412" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id405" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.flags.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id432" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id425" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.format.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id396" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id389" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsnocheck.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id428" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id421" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsreadonly.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id430" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id423" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsreadwrite.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id414" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id407" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.hybrid.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id416" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id409" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.hybridpersistent.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id163" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id154" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.image.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id436" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id427" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.installiso.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id429" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.installstick.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id433" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.kernelcmdline.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id424" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id417" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.luks.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id398" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id391" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.lvm.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id434" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id431" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.primary.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id422" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id415" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.vga.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id410" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id403" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.volid.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id88" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id91" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id89" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id92" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.ro.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id91" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id94" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.rw.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id93" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id96" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.type.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id281" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id274" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.home.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id444" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id441" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.id.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id274" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id267" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id277" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id270" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.pwd.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id448" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id445" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.pwdformat</a></b></div>
-                              <div><b><a href="kiwi0.html#id446" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id443" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.realname.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id450" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id447" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.shell.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id347" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id340" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.username.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id284" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id277" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id285" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id278" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.group.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id478" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id479" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.id.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id137" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.attlist</a></b></div>
+                              <div><b><a href="kiwi0.html#id135" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.attlist</a></b></div>
+                              <div><b><a href="kiwi0.html#id136" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.controller.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id455" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.device.attribute</a></b></div>
                               <div><b><a href="kiwi0.html#id138" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.controller.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id140" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.id.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id463" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.HWversion.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id461" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.arch.attribute</a></b></div>
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.id.attribute</a></b></div>
                               <div><b><a href="kiwi0.html#id142" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id465" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.guestOS.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.memory.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id467" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.usb.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id131" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id132" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.controller.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id134" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.id.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id123" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id124" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.driver.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.interface.attribute</a></b></div>
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.attlist</a></b></div>
+                              <div><b><a href="kiwi0.html#id143" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.controller.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id145" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.id.attribute</a></b></div>
                               <div><b><a href="kiwi0.html#id128" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.mode.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.attlist</a></b></div>
+                              <div><b><a href="kiwi0.html#id449" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.driver.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id130" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.interface.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id453" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.mac.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id451" target="mainFrame" title="No namespace"
+                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.mode.attribute</a></b></div>
+                              <div><b><a href="kiwi0.html#id44" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id438" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id435" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.freespace.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id46" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id47" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id440" target="mainFrame" title="No namespace"
+                              <div><b><a href="kiwi0.html#id437" target="mainFrame" title="No namespace"
                                        onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.size.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id155" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id452" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.mac.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id157" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.name.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id159" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id471" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.domain.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id469" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.memory.attribute</a></b></div>
-                              <div><b><a href="kiwi0.html#id151" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xendisk.attlist</a></b></div>
-                              <div><b><a href="kiwi0.html#id152" target="mainFrame" title="No namespace"
-                                       onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xendisk.device.attribute</a></b></div>
                            </div>
                         </td>
                         <td class="rt_lineRight"></td>
@@ -1718,180 +1706,176 @@
                                     
                                  </div>
                                  <div id="kiwi.xsdElement" style="display:block">
-                                    <div><b><a href="kiwi0.html#id213" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id206" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">arch</a></b></div>
-                                    <div><b><a href="kiwi0.html#id212" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id205" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">architectures</a></b></div>
-                                    <div><b><a href="kiwi0.html#id324" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id317" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">archive</a></b></div>
-                                    <div><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id30" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">author</a></b></div>
-                                    <div><b><a href="kiwi0.html#id198" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id191" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">boot-theme</a></b></div>
-                                    <div><b><a href="kiwi0.html#id267" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id260" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">chroot</a></b></div>
-                                    <div><b><a href="kiwi0.html#id95" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id98" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">configuration</a></b></div>
-                                    <div><b><a href="kiwi0.html#id30" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id31" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">contact</a></b></div>
-                                    <div><b><a href="kiwi0.html#id201" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id194" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultbaseroot</a></b></div>
-                                    <div><b><a href="kiwi0.html#id199" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id192" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultdestination</a></b></div>
-                                    <div><b><a href="kiwi0.html#id200" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id193" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">defaultroot</a></b></div>
-                                    <div><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id29" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">description</a></b></div>
-                                    <div><b><a href="kiwi0.html#id288" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id281" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">drivers</a></b></div>
-                                    <div><b><a href="kiwi0.html#id38" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2accountnr</a></b></div>
                                     <div><b><a href="kiwi0.html#id39" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2accountnr</a></b></div>
+                                    <div><b><a href="kiwi0.html#id40" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2certfile</a></b></div>
-                                    <div><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id38" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2config</a></b></div>
-                                    <div><b><a href="kiwi0.html#id40" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id41" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ec2privatekeyfile</a></b></div>
-                                    <div><b><a href="kiwi0.html#id113" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b></div>
                                     <div><b><a href="kiwi0.html#id116" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">except</a></b></div>
+                                    <div><b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">file</a></b></div>
-                                    <div><b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id314" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">ignore</a></b></div>
-                                    <div><b><a href="kiwi0.html#id27" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id28" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image</a></b></div>
-                                    <div><b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">initrd</a></b></div>
-                                    <div><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instrepo</a></b></div>
-                                    <div><b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">instsource</a></b></div>
-                                    <div><b><a href="kiwi0.html#id73" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id76" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">kernel</a></b></div>
-                                    <div><b><a href="kiwi0.html#id195" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id188" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">keytable</a></b></div>
-                                    <div><b><a href="kiwi0.html#id197" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id190" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">locale</a></b></div>
-                                    <div><b><a href="kiwi0.html#id41" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id42" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">lvmvolumes</a></b></div>
-                                    <div><b><a href="kiwi0.html#id246" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">machine</a></b></div>
+                                    <div><b><a href="kiwi0.html#id239" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metadata</a></b></div>
-                                    <div><b><a href="kiwi0.html#id258" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id251" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">metafile</a></b></div>
-                                    <div><b><a href="kiwi0.html#id58" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id59" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-boot-title</a></b></div>
-                                    <div><b><a href="kiwi0.html#id67" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id70" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-dumphalt</a></b></div>
-                                    <div><b><a href="kiwi0.html#id56" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id57" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-home</a></b></div>
-                                    <div><b><a href="kiwi0.html#id59" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id66" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-inplace-recovery</a></b></div>
+                                    <div><b><a href="kiwi0.html#id60" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-kiwi-initrd</a></b></div>
-                                    <div><b><a href="kiwi0.html#id54" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id55" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-partition-install</a></b></div>
-                                    <div><b><a href="kiwi0.html#id65" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id68" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-reboot</a></b></div>
-                                    <div><b><a href="kiwi0.html#id62" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id63" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recovery</a></b></div>
-                                    <div><b><a href="kiwi0.html#id64" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id65" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-recoveryID</a></b></div>
-                                    <div><b><a href="kiwi0.html#id52" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id53" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swap</a></b></div>
-                                    <div><b><a href="kiwi0.html#id61" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id62" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-swapsize</a></b></div>
-                                    <div><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id52" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-systemsize</a></b></div>
-                                    <div><b><a href="kiwi0.html#id69" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id72" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oem-unattended</a></b></div>
-                                    <div><b><a href="kiwi0.html#id50" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id51" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">oemconfig</a></b></div>
-                                    <div><b><a href="kiwi0.html#id309" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id302" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensusePattern</a></b></div>
-                                    <div><b><a href="kiwi0.html#id317" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id310" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">opensuseProduct</a></b></div>
-                                    <div><b><a href="kiwi0.html#id302" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id295" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">package</a></b></div>
-                                    <div><b><a href="kiwi0.html#id187" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id180" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packagemanager</a></b></div>
-                                    <div><b><a href="kiwi0.html#id301" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">packages</a></b></div>
-                                    <div><b><a href="kiwi0.html#id76" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id79" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partition</a></b></div>
-                                    <div><b><a href="kiwi0.html#id75" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id78" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">partitions</a></b></div>
-                                    <div><b><a href="kiwi0.html#id120" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id125" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">persistent</a></b></div>
-                                    <div><b><a href="kiwi0.html#id35" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">preferences</a></b></div>
-                                    <div><b><a href="kiwi0.html#id227" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id220" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productinfo</a></b></div>
-                                    <div><b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id218" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoption</a></b></div>
-                                    <div><b><a href="kiwi0.html#id224" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id217" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productoptions</a></b></div>
-                                    <div><b><a href="kiwi0.html#id229" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id222" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">productvar</a></b></div>
-                                    <div><b><a href="kiwi0.html#id205" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id198" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profile</a></b></div>
-                                    <div><b><a href="kiwi0.html#id204" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id197" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">profiles</a></b></div>
-                                    <div><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id74" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">pxedeploy</a></b></div>
-                                    <div><b><a href="kiwi0.html#id247" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id240" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackage</a></b></div>
-                                    <div><b><a href="kiwi0.html#id270" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id263" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repopackages</a></b></div>
-                                    <div><b><a href="kiwi0.html#id293" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id286" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">repository</a></b></div>
-                                    <div><b><a href="kiwi0.html#id220" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id213" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">requiredarch</a></b></div>
-                                    <div><b><a href="kiwi0.html#id313" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id306" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rhelGroup</a></b></div>
-                                    <div><b><a href="kiwi0.html#id189" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id182" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-check-signatures</a></b></div>
-                                    <div><b><a href="kiwi0.html#id191" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id184" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-excludedocs</a></b></div>
-                                    <div><b><a href="kiwi0.html#id193" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id186" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">rpm-force</a></b></div>
-                                    <div><b><a href="kiwi0.html#id107" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id110" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size</a></b></div>
-                                    <div><b><a href="kiwi0.html#id233" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">source</a></b></div>
-                                    <div><b><a href="kiwi0.html#id31" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id32" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">specification</a></b></div>
-                                    <div><b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id114" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">split</a></b></div>
-                                    <div><b><a href="kiwi0.html#id112" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id115" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">temporary</a></b></div>
-                                    <div><b><a href="kiwi0.html#id72" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id75" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timeout</a></b></div>
-                                    <div><b><a href="kiwi0.html#id196" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id189" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">timezone</a></b></div>
-                                    <div><b><a href="kiwi0.html#id36" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id37" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">type</a></b></div>
-                                    <div><b><a href="kiwi0.html#id87" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id90" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">union</a></b></div>
-                                    <div><b><a href="kiwi0.html#id272" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id265" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">user</a></b></div>
-                                    <div><b><a href="kiwi0.html#id271" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id264" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">users</a></b></div>
-                                    <div><b><a href="kiwi0.html#id186" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id179" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">version</a></b></div>
-                                    <div><b><a href="kiwi0.html#id136" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwarecdrom</a></b></div>
-                                    <div><b><a href="kiwi0.html#id121" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwareconfig</a></b></div>
-                                    <div><b><a href="kiwi0.html#id130" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwaredisk</a></b></div>
-                                    <div><b><a href="kiwi0.html#id122" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmwarenic</a></b></div>
-                                    <div><b><a href="kiwi0.html#id42" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id134" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmdisk</a></b></div>
+                                    <div><b><a href="kiwi0.html#id141" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmdvd</a></b></div>
+                                    <div><b><a href="kiwi0.html#id127" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">vmnic</a></b></div>
+                                    <div><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">volume</a></b></div>
-                                    <div><b><a href="kiwi0.html#id154" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenbridge</a></b></div>
-                                    <div><b><a href="kiwi0.html#id149" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xenconfig</a></b></div>
-                                    <div><b><a href="kiwi0.html#id150" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">xendisk</a></b></div>
                                  </div>
                               </td>
                               <td class="rt_lineRight"></td>
@@ -1917,29 +1901,33 @@
                                     
                                  </div>
                                  <div id="kiwi.xsdSimple_Type" style="display:block">
-                                    <div><b><a href="kiwi0.html#id68" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id4" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">image-name</a></b></div>
+                                    <div><b><a href="kiwi0.html#id71" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-dumphalt.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id57" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id58" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-home.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id60" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id67" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-inplace-recovery.content</a></b></div>
+                                    <div><b><a href="kiwi0.html#id61" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-kiwi-initrd.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id55" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id56" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-partition-install.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id66" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id69" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-reboot.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id63" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id64" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-recovery.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id53" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id54" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-swap.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id70" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id73" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.oem-unattended.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id188" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id181" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packagemanager.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id190" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id183" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rpm-check-signatures.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id192" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id185" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rpm-excludedocs.content</a></b></div>
-                                    <div><b><a href="kiwi0.html#id194" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id187" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rpm-force.content</a></b></div>
                                     <div><b><a href="kiwi0.html#id2" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">size-type</a></b></div>
@@ -1970,7 +1958,7 @@
                                     
                                  </div>
                                  <div id="kiwi.xsdComplex_Type" style="display:block">
-                                    <div><b><a href="kiwi0.html#id232" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id225" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source</a></b></div>
                                  </div>
                               </td>
@@ -1997,384 +1985,378 @@
                                     
                                  </div>
                                  <div id="kiwi.xsdAttribute_Group" style="display:block">
-                                    <div><b><a href="kiwi0.html#id214" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id207" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id339" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id332" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id459" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id462" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.fallback.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id215" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id208" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.id.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id218" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id211" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.arch.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id325" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id318" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id375" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id368" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.bootinclude.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id326" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id319" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.archive.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id337" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id330" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.bootdelete.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id335" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id328" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.bootinclude.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id268" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id261" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.chroot.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id349" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id342" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id96" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id99" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id100" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id103" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.dest.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id97" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id100" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.configuration.source.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id32" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id33" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id341" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id334" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id33" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id34" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.description.type.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id101" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id104" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.dest.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id8" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id9" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.displayname.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id289" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id282" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id458" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id461" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.profiles.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id290" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id283" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.drivers.type.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id114" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id117" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.except.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id115" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id118" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.except.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id350" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id343" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id117" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id122" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id118" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id123" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.file.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id216" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id209" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.id.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id322" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id315" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.ignore.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id323" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id316" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.ignore.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id22" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id23" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id7" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id8" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.displayname.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id20" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id21" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.id</a></b></div>
-                                    <div><b><a href="kiwi0.html#id14" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id15" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.inherit.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id18" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id19" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.kiwirevision.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id4" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id5" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id10" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id11" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.noNamespaceSchemaLocation.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id12" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id13" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.schemaLocation.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id16" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id17" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.image.schemaversion.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id238" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id6" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.imagename.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id231" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id353" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id346" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.local.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id239" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id232" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id234" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.priority.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id352" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id345" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.pwd.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id351" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id344" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.instrepo.username.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id48" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id49" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.lvmvolumes.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id442" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id439" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.lvmvolumes.lvmgroup.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id259" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id466" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.HWversion.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id464" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.arch.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.attlist</a></b></div>
+                                    <div><b><a href="kiwi0.html#id472" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.domain.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id468" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.guestOS.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id470" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.machine.memory.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id252" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id262" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id255" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.script.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id265" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id258" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.target.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id260" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id253" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.metafile.url.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id5" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id119" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id355" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id348" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id310" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id311" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id304" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensusepattern.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id357" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id350" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id318" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id311" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id319" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id312" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.opensuseproduct.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id371" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id364" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id303" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id296" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id374" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id367" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.bootdelete.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id373" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id366" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.bootinclude.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id304" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id297" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id372" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id365" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.package.replaces.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id328" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id321" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id475" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id476" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.patternType.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id473" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id474" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.profiles.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id329" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id322" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.packages.type.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id77" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id379" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id372" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.mountpoint.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id80" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id83" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.number.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id378" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id371" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.size.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id381" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id374" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.target.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id78" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id81" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partition.type.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id85" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id88" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partitions.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id376" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id369" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.partitions.device.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id236" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id229" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.path.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id202" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id195" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.preferences.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id477" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id478" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.preferences.profiles.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id228" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id221" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productinfo.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id226" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id219" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productoption.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id230" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id223" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.productvar.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id206" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id199" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id208" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id201" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.description.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id383" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id376" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.import.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id207" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id200" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profile.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id343" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id336" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.profiles.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id278" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id271" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pwd.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id104" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id107" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id456" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id459" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.blocksize.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id454" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id457" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.pxedeploy.server.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id333" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id326" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.replaces.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id361" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id354" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.addarch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id358" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id351" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id248" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id241" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id359" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id352" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.forcerepo.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id367" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id360" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.medium.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id249" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id242" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id365" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id358" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.onlyarch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id363" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id356" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.removearch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id370" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id363" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.script.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id369" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id362" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repopackage.source.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id388" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id381" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.alias.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id294" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id287" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id390" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id383" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.priority.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id385" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id378" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.profiles.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id386" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id379" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.status.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id295" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id288" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.repository.type.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id221" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id214" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.requiredarch.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id222" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id215" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.requiredarch.ref.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id356" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id349" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.arch.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id314" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id307" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id315" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id308" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.rhelgroup.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id263" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id256" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.script.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id394" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id387" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.additive.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id108" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id111" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id345" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id338" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id392" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id385" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.size.unit.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id234" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id227" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id98" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id101" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id235" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id228" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.source.path.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id162" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id153" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id400" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id393" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.baseroot.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id406" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id399" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.boot.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id404" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id397" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootkernel.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id418" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id411" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootloader.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id402" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id395" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.bootprofile.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id408" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id401" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.checkprebuilt.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id420" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id413" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.compressed.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id426" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id419" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.filesystem.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id412" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id405" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.flags.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id432" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id425" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.format.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id396" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id389" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsnocheck.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id428" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id421" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsreadonly.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id430" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id423" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.fsreadwrite.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id414" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id407" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.hybrid.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id416" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id409" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.hybridpersistent.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id163" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id154" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.image.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id436" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id427" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.installiso.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id429" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.installstick.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id433" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.kernelcmdline.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id424" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id417" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.luks.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id398" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id391" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.lvm.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id434" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id431" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.primary.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id422" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id415" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.vga.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id410" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id403" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.type.volid.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id88" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id91" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id89" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id92" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.ro.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id91" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id94" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.rw.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id93" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id96" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.union.type.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id273" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id266" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id281" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id274" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.home.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id444" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id441" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.id.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id274" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id267" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id277" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id270" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.pwd.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id448" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id445" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.pwdformat</a></b></div>
-                                    <div><b><a href="kiwi0.html#id446" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id443" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.realname.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id450" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id447" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.user.shell.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id347" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id340" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.username.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id284" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id277" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id285" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id278" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.group.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id478" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id479" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.users.id.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id137" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.attlist</a></b></div>
+                                    <div><b><a href="kiwi0.html#id135" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.attlist</a></b></div>
+                                    <div><b><a href="kiwi0.html#id136" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.controller.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id455" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.device.attribute</a></b></div>
                                     <div><b><a href="kiwi0.html#id138" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.controller.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id140" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarecdrom.id.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id463" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.HWversion.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id461" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.arch.attribute</a></b></div>
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdisk.id.attribute</a></b></div>
                                     <div><b><a href="kiwi0.html#id142" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id465" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.guestOS.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id147" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.memory.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id467" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwareconfig.usb.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id131" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id132" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.controller.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id134" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwaredisk.id.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id123" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id124" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.driver.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id126" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.interface.attribute</a></b></div>
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.attlist</a></b></div>
+                                    <div><b><a href="kiwi0.html#id143" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.controller.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id145" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmdvd.id.attribute</a></b></div>
                                     <div><b><a href="kiwi0.html#id128" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmwarenic.mode.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id43" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.attlist</a></b></div>
+                                    <div><b><a href="kiwi0.html#id449" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.driver.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id130" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.interface.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id453" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.mac.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id451" target="mainFrame" title="No namespace"
+                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.vmnic.mode.attribute</a></b></div>
+                                    <div><b><a href="kiwi0.html#id44" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id438" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id435" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.freespace.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id46" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id47" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id440" target="mainFrame" title="No namespace"
+                                    <div><b><a href="kiwi0.html#id437" target="mainFrame" title="No namespace"
                                              onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.volume.size.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id155" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id452" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.mac.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id157" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenbridge.name.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id159" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id471" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.domain.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id469" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xenconfig.memory.attribute</a></b></div>
-                                    <div><b><a href="kiwi0.html#id151" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xendisk.attlist</a></b></div>
-                                    <div><b><a href="kiwi0.html#id152" target="mainFrame" title="No namespace"
-                                             onclick="updatePageTitle('Schema documentation for kiwi.xsd')">k.xendisk.device.attribute</a></b></div>
                                  </div>
                               </td>
                               <td class="rt_lineRight"></td>
@@ -2408,10 +2390,10 @@
                                     
                                  </div>
                                  <div id="xsi.xsdAttribute" style="display:block">
-                                    <div><b><a href="kiwi1.html#id11" target="mainFrame"
+                                    <div><b><a href="kiwi1.html#id12" target="mainFrame"
                                              title="http://www.w3.org/2001/XMLSchema-instance"
                                              onclick="updatePageTitle('Schema documentation for xsi.xsd')">@xsi:noNamespaceSchemaLocation</a></b></div>
-                                    <div><b><a href="kiwi1.html#id13" target="mainFrame"
+                                    <div><b><a href="kiwi1.html#id14" target="mainFrame"
                                              title="http://www.w3.org/2001/XMLSchema-instance"
                                              onclick="updatePageTitle('Schema documentation for xsi.xsd')">@xsi:schemaLocation</a></b></div>
                                  </div>
diff --git a/kiwi.pl b/kiwi.pl
index b1b4589..6f2c7cf 100755
--- a/kiwi.pl
+++ b/kiwi.pl
@@ -41,6 +41,7 @@ use KIWIMigrate;
 use KIWIOverlay;
 use KIWIQX;
 use KIWITest;
+use KIWIImageFormat;
 
 #============================================
 # Globals (Version)
@@ -147,7 +148,6 @@ our $BootStick;             # deploy initrd booting from USB stick
 our $BootStickSystem;       # system image to be copied on an USB stick
 our $BootStickDevice;       # device to install stick image on
 our $BootVMSystem;          # system image to be copied on a VM disk
-our $BootVMFormat;          # virtual disk format supported by qemu-img
 our $BootVMDisk;            # deploy initrd booting from a VM 
 our $BootVMSize;            # size of virtual disk
 our $InstallCD;             # Installation initrd booting from CD
@@ -206,6 +206,8 @@ our $Debug;                 # activates the internal stack trace output
 our $GrubChainload;         # install grub loader in first partition not MBR
 our $MigrateNoFiles;        # migrate: don't create overlay files
 our $MigrateNoTemplate;     # migrate: don't create image description template
+our $Convert;               # convert image into given format/configuration
+our $Format;                # format to convert to, vmdk, ovf, etc...
 our $kiwi;                  # global logging handler object
 
 #============================================
@@ -1144,7 +1146,7 @@ sub main {
 		$kiwi -> info ("Creating boot USB stick from: $BootStick...\n");
 		$boot = new KIWIBoot (
 			$kiwi,$BootStick,$BootStickSystem,undef,
-			$BootStickDevice,undef,$LVM
+			$BootStickDevice,$LVM
 		);
 		if (! defined $boot) {
 			my $code = kiwiExit (1); return $code;
@@ -1255,7 +1257,7 @@ sub main {
 		}
 		$boot = new KIWIBoot (
 			$kiwi,$BootVMDisk,$BootVMSystem,
-			$BootVMSize,undef,$BootVMFormat,$LVM,\@ProfilesOrig
+			$BootVMSize,undef,$LVM,\@ProfilesOrig
 		);
 		if (! defined $boot) {
 			my $code = kiwiExit (1); return $code;
@@ -1267,6 +1269,37 @@ sub main {
 		$boot -> cleanTmp();
 		$code = kiwiExit (0); return $code;
 	}
+	
+	#==========================================
+	# Convert image into format/configuration
+	#------------------------------------------
+	if (defined $Convert) {
+		if ($Format) {
+			$kiwi -> info ("Converting into $Format...\n");
+		} else {
+			$kiwi -> info ("Converting...\n");
+		}
+		my $format = new KIWIImageFormat ($kiwi,$Convert,$Format);
+		if (! $format) {
+			my $code = kiwiExit (1);
+			return $code;
+		}
+		my $config_result = $format -> createMaschineConfiguration();
+		my $format_result = $format -> createFormat();
+		if (! $format_result) {
+			if ($Format) {
+				$kiwi -> warning ("No conversion possible for $Format");
+			} else {
+				$kiwi -> warning ("No format for conversion specified");
+			}
+			$kiwi -> skipped ();
+		}
+		if (! $config_result) {
+			$kiwi -> warning ("No machine configuration possible");
+			$kiwi -> skipped ();
+		}
+		my $code = kiwiExit (0); return $code;
+	}
 	return 1;
 }
 
@@ -1323,7 +1356,6 @@ sub init {
 		"bootstick-system=s"    => \$BootStickSystem,
 		"bootstick-device=s"    => \$BootStickDevice,
 		"bootvm-system=s"       => \$BootVMSystem,
-		"bootvm-format=s"       => \$BootVMFormat,
 		"bootvm-disksize=s"     => \$BootVMSize,
 		"installcd=s"           => \$InstallCD,
 		"installcd-system=s"    => \$InstallCDSystem,
@@ -1359,6 +1391,8 @@ sub init {
 		"clone|o=s"             => \$Clone,
 		"lvm"                   => \$LVM,
 		"grub-chainload"        => \$GrubChainload,
+		"format|f=s"            => \$Format,
+		"convert=s"             => \$Convert,
 		"debug"                 => \$Debug,
 		"help|h"                => \&usage,
 		"<>"                    => \&usage
@@ -1439,7 +1473,8 @@ sub init {
 		(! defined $BootCD)             &&
 		(! defined $BootUSB)            &&
 		(! defined $Clone)              &&
-		(! defined $RunTestSuite)
+		(! defined $RunTestSuite)       &&
+		(! defined $Convert)
 	) {
 		$kiwi -> error ("No operation specified");
 		$kiwi -> failed ();
@@ -1560,13 +1595,14 @@ sub usage {
 	print "       [ --bootstick-device <device> ]\n";
 	print "    kiwi --bootvm <initrd> --bootvm-system <systemImage>\n";
 	print "       [ --bootvm-disksize <size> ]\n";
-	print "       [ --bootvm-format <format> ]\n";
 	print "    kiwi --bootcd  <initrd>\n";
 	print "    kiwi --bootusb <initrd>\n";
 	print "    kiwi --installcd <initrd>\n";
 	print "       [ --installcd-system <vmx-system-image> ]\n";
 	print "    kiwi --installstick <initrd>\n";
 	print "       [ --installstick-system <vmx-system-image> ]\n";
+	print "Image format conversion:\n";
+	print "    kiwi --convert <systemImage> [ --format <vmdk|ovf|qcow2> ]\n";
 	print "Testsuite:\n";
 	print "    kiwi --testsuite <image-root> \n";
 	print "       [ --test name --test name ... ]\n";
@@ -2540,8 +2576,8 @@ sub mount {
 	# Check result of filesystem detection
 	#------------------------------------------
 	if (! %fsattr) {
-		$kiwi -> failed ();
 		$kiwi -> error  ("Couldn't detect filesystem on: $source");
+		$kiwi -> failed ();
 		return undef;
 	}
 	#==========================================
diff --git a/modules/KIWIBoot.pm b/modules/KIWIBoot.pm
index f617dd9..1d9467e 100644
--- a/modules/KIWIBoot.pm
+++ b/modules/KIWIBoot.pm
@@ -56,7 +56,6 @@ sub new {
 	my $system = shift;
 	my $vmsize = shift;
 	my $device = shift;
-	my $format = shift;
 	my $lvm    = shift;
 	my $profile= shift;
 	#==========================================
@@ -87,7 +86,7 @@ sub new {
 	#==========================================
 	# check initrd file parameter
 	#------------------------------------------
-	if (! -f $initrd) {
+	if ((defined $initrd) && (! -f $initrd)) {
 		$kiwi -> error  ("Couldn't find initrd file: $initrd");
 		$kiwi -> failed ();
 		return undef;
@@ -134,7 +133,7 @@ sub new {
 			$kernel = File::Spec->catfile(dirname($initrd), $kernel);
 		}
 	}
-	if (! -f $kernel) {
+	if ((defined $initrd) && (! -f $kernel)) {
 		$kiwi -> error  ("Couldn't find kernel file: $kernel");
 		$kiwi -> failed ();
 		return undef;
@@ -406,7 +405,6 @@ sub new {
 	$this->{vmsize}    = $vmsize;
 	$this->{syszip}    = $syszip;
 	$this->{device}    = $device;
-	$this->{format}    = $format;
 	$this->{zipped}    = $zipped;
 	$this->{isxen}     = $isxen;
 	$this->{xengz}     = $xengz;
@@ -2243,7 +2241,6 @@ sub setupBootDisk {
 	my $arch      = $this->{arch};
 	my $system    = $this->{system};
 	my $vmsize    = $this->{vmsize};
-	my $format    = $this->{format};
 	my $syszip    = $this->{syszip};
 	my $tmpdir    = $this->{tmpdir};
 	my $initrd    = $this->{initrd};
@@ -3074,56 +3071,28 @@ sub setupBootDisk {
 	#==========================================
 	# Create image described by given format
 	#------------------------------------------
-	if (defined $format) {
-		if ($initrd =~ /oemboot/) {
-			#==========================================
-			# OEM formats...
-			#------------------------------------------
-			if ($format eq "iso") {
-				$this -> {system} = $diskname;
-				$kiwi -> info ("Creating install ISO image\n");
-				$this -> cleanLoop ("keep-mountpoints");
-				if (! $this -> setupInstallCD()) {
-					return undef;
-				}
-			}
-			if ($format eq "usb") {
-				$this -> {system} = $diskname;
-				$kiwi -> info ("Creating install USB Stick image\n");
-				$this -> cleanLoop ("keep-mountpoints");
-				if (! $this -> setupInstallStick()) {
-					return undef;
-				}
-			}
-		} else {
-			#==========================================
-			# VMX formats...
-			#------------------------------------------
-			if ($format eq "ovf") {
-				$format = "vmdk";
-			}
-			$kiwi -> info ("Creating $format image");
-			my %vmwc  = ();
-			my $fname = $diskname;
-			$fname =~ s/\.raw$/\.$format/;
-			if ($format eq "vmdk") {
-				%vmwc = $xml -> getVMwareConfig();
-			}
-			my $convert = "convert -f raw $this->{loop} -O $format";
-			if (($vmwc{vmware_disktype}) && ($vmwc{vmware_disktype}=~/^scsi/)) {
-				$status = qxx ("qemu-img $convert -s $fname 2>&1");
-			} else {
-				$status = qxx ("qemu-img $convert $fname 2>&1");
+	if ($initrd =~ /oemboot/) {
+		#==========================================
+		# OEM Install CD...
+		#------------------------------------------
+		if ($type{installiso} =~ /true|yes/i) {
+			$this -> {system} = $diskname;
+			$kiwi -> info ("Creating install ISO image\n");
+			$this -> cleanLoop ("keep-mountpoints");
+			if (! $this -> setupInstallCD()) {
+				return undef;
 			}
-			$result = $? >> 8;
-			if ($result != 0) {
-				$kiwi -> failed ();
-				$kiwi -> error  ("Couldn't create $format image: $status");
-				$kiwi -> failed ();
-				$this -> cleanLoop ();
+		}
+		#==========================================
+		# OEM Install Stick...
+		#------------------------------------------
+		if ($type{installstick} =~ /true|yes/i) {
+			$this -> {system} = $diskname;
+			$kiwi -> info ("Creating install USB Stick image\n");
+			$this -> cleanLoop ("keep-mountpoints");
+			if (! $this -> setupInstallStick()) {
 				return undef;
 			}
-			$kiwi -> done ();
 		}
 	}
 	#==========================================
diff --git a/modules/KIWIImage.pm b/modules/KIWIImage.pm
index 32cbb42..d9cc053 100644
--- a/modules/KIWIImage.pm
+++ b/modules/KIWIImage.pm
@@ -1164,7 +1164,6 @@ sub createImageVMX {
 	#------------------------------------------
 	$main::BootVMDisk  = $main::Destination."/".$name->{bootImage}.".splash.gz";
 	$main::BootVMSystem= $main::Destination."/".$name->{systemImage};
-	$main::BootVMFormat= $name->{format};
 	if (defined $name->{imageTree}) {
 		$main::BootVMSystem = $name->{imageTree};
 	}
@@ -1173,82 +1172,15 @@ sub createImageVMX {
 		return undef;
 	}
 	#==========================================
-	# Create virtual disk configuration for Xen
+	# Create VM format/configuration
 	#------------------------------------------
-	if (($type{bootprofile} eq "xen") && ($xendomain ne "dom0")) {
-		# Xen config file
-		if (! $this -> buildXenConfig ($main::Destination,$name,\%xenc,"VMX")) {
-			$main::Survive = "default";
-			return undef;
-		}
-	}
-	if (defined $main::BootVMFormat) {
-		#==========================================
-		# VMware virtual disk description
-		#------------------------------------------
-		my $vmxfile; 
-		if ($type{bootprofile} ne "xen" && $main::BootVMFormat =~ "vmdk|ovf") {
-			# VMware vmx file...
-			$vmxfile = $this -> buildVMwareConfig (
-				$main::Destination,$name,\%vmwc
-			);
-			if (! $vmxfile) {
-				$main::Survive = "default";
-				return undef;
-			}
-		}
-		#==========================================
-		# VMware open virtual format image
-		#------------------------------------------
-		if ($main::BootVMFormat eq "ovf") {
-			# VMware ovf file...
-			# in case of the ovf format we need to call the ovftool from
-			# VMware. The tool is able to convert from a vmx into an ovf
-			# ----
-			$kiwi -> info ("Creating OVF image...");
-			my $ovffile = $vmxfile;
-			my $ovftool = "/usr/bin/ovftool";
-			if (! -x $ovftool) {
-				$kiwi -> failed ();
-				$kiwi -> error  ("Can't find $ovftool, is it installed ?");
-				$kiwi -> failed ();
-				$main::Survive = "default";
-				return undef;
-			}
-			$ovffile =~ s/\.vmx$/\.ovf/;
-			# /.../
-			# temporary hack, because ovftool is not able to handle
-			# scsi-hardDisk correctly at the moment
-			# ---- beg ----
-			qxx ("sed -i -e 's;scsi-hardDisk;disk;' $vmxfile");
-			# ---- end ----
-			my $status = qxx ("rm -rf $ovffile; mkdir -p $ovffile 2>&1");
-			my $result = $? >> 8;
-			if ($result != 0) {
-				$kiwi -> failed ();
-				$kiwi -> error  ("Couldn't create OVF directory: $status");
-				$kiwi -> failed ();
-				$main::Survive = "default";
-				return undef;
-			}
-			my $output = basename $ovffile;
-			$status= qxx (
-				"$ovftool -o -q $vmxfile $ovffile/$output 2>&1"
-			);
-			$result = $? >> 8;
-			# --- beg ----
-			qxx ("sed -i -e 's;disk;scsi-hardDisk;' $vmxfile");
-			qxx ("rm -rf $main::Destination/*.lck 2>&1");
-			# --- end ----
-			if ($result != 0) {
-				$kiwi -> failed ();
-				$kiwi -> error  ("Couldn't create OVF image: $status");
-				$kiwi -> failed ();
-				$main::Survive = "default";
-				return undef;
-			}
-			$kiwi -> done();
-		}
+	undef $main::BootVMDisk;
+	undef $main::BootVMSystem;
+	$main::Convert = $main::Destination."/".$name->{systemImage}.".raw";
+	$main::Format  = $name->{format};
+	if (! defined main::main()) {
+		$main::Survive = "default";
+		return undef;
 	}
 	$main::Survive = "default";
 	return $this;
@@ -1274,6 +1206,7 @@ sub createImageXen {
 	#------------------------------------------
 	my $this = shift;
 	my $para = shift;
+	my $kiwi = $this->{kiwi};
 	my $xml  = $this->{xml};
 	my %xenc = $xml  -> getXenConfig();
 	my $name = $this -> createImageUSB ($para,"Xen");
@@ -1282,10 +1215,12 @@ sub createImageXen {
 	}
 	undef $main::Prepare;
 	undef $main::Create;
+	undef $main::Format;
 	#==========================================
-	# Create image xenconfig
+	# Create VM format/configuration
 	#------------------------------------------
-	if (! $this -> buildXenConfig ($main::Destination,$name,\%xenc, "XEN")) {
+	$main::Convert = $main::Destination."/".$name->{systemImage};
+	if (! defined main::main()) {
 		$main::Survive = "default";
 		return undef;
 	}
@@ -2923,21 +2858,20 @@ sub createImageSplit {
 		$main::BootVMDisk  = $main::Destination."/".$name->{bootImage};
 		$main::BootVMDisk  = $main::BootVMDisk.".splash.gz";
 		$main::BootVMSystem= $main::Destination."/".$name->{systemImage};
-		$main::BootVMFormat= $name->{format};
 		if (! defined main::main()) {
 			$main::Survive = "default";
 			return undef;
 		}
 		#==========================================
-		# Create virtual disk configuration
+		# Create VM format/configuration
 		#------------------------------------------
-		if ((defined $main::BootVMFormat) && ($main::BootVMFormat eq "vmdk")) {
-			# VMware vmx file...
-			my %vmwc = $sxml -> getVMwareConfig ();
-			if (! $this-> buildVMwareConfig ($main::Destination,$name,\%vmwc)) {
-				$main::Survive = "default";
-				return undef;
-			}
+		undef $main::BootVMDisk;
+		undef $main::BootVMSystem;
+		$main::Convert = $main::Destination."/".$name->{systemImage}.".raw";
+		$main::Format  = $name->{format};
+		if (! defined main::main()) {
+			$main::Survive = "default";
+			return undef;
 		}
 	}
 	$main::Survive = "default";
@@ -3849,215 +3783,6 @@ sub setupSquashFS {
 }
 
 #==========================================
-# buildXenConfig
-#------------------------------------------
-sub buildXenConfig {
-	my $this   = shift;
-	my $dest   = shift;
-	my $name   = shift;
-	my $xenref = shift;
-	my $text   = shift;
-	my $kiwi   = $this->{kiwi};
-	my $file   = $dest."/".$name->{systemImage}.".xenconfig";
-	my $initrd = $name->{bootImage}.".splash.gz";
-	my $kernel = $dest."/".$name->{bootImage}.".kernel";
-	$kernel    = readlink ($kernel);
-	$kernel    = basename ($kernel);
-	my %xenconfig = %{$xenref};
-	my $format = "raw";
-	if (defined $main::BootVMFormat) {
-		$format = $main::BootVMFormat;
-	}
-	$kiwi -> info ("Creating image Xen configuration file...");
-	if (! %xenconfig) {
-		$kiwi -> skipped ();
-		$kiwi -> warning ("Missing Xen virtualisation config data");
-		$kiwi -> skipped ();
-		return $dest;
-	}
-	if (! open (FD,">$file")) {
-		$kiwi -> failed ();
-		$kiwi -> error  ("Couldn't create xenconfig file: $!");
-		$kiwi -> failed ();
-		return undef;
-	}
-	#==========================================
-	# global setup
-	#------------------------------------------
-	my $device = $xenconfig{xen_diskdevice};
-	$device =~ s/\/dev\///;
-	my $part = $device."1";
-	if ($text eq "XEN") {
-		$device = $device."1";
-	}
-	my $memory = $xenconfig{xen_memory};
-	my $image  = $name->{systemImage};
-	if ($text eq "VMX") {
-		$image .= ".".$format;
-	}
-	print FD '#  -*- mode: python; -*-'."\n";
-	print FD "name=\"".$this->{xml}->getImageDisplayName()."\"\n";
-	if ($text eq "XEN") {
-		print FD 'kernel="'.$kernel.'"'."\n";
-		print FD 'ramdisk="'.$initrd.'"'."\n";
-	}
-	print FD 'memory='.$memory."\n";
-	if ($text eq "VMX") {
-		my $tap = $format;
-		if ($tap eq "raw") {
-			$tap = "aio";
-		}
-		print FD 'disk=[ "tap:'.$tap.':'.$image.','.$device.',w" ]'."\n";
-	} else {
-		print FD 'disk=[ "file:'.$image.','.$part.',w" ]'."\n";
-	}
-	#==========================================
-	# network setup
-	#------------------------------------------
-	my $vifcount = -1;
-	foreach my $bname (keys %{$xenconfig{xen_bridge}}) {
-		$vifcount++;
-		my $mac = $xenconfig{xen_bridge}{$bname};
-		my $vif = '"bridge='.$bname.'"';
-		if ($bname eq "undef") {
-			$vif = '""';
-		}
-		if ($mac) {
-			$vif = '"mac='.$mac.',bridge='.$bname.'"';
-			if ($bname eq "undef") {
-				$vif = '"mac='.$mac.'"';
-			}
-		}
-		if ($vifcount == 0) {
-			print FD "vif=[ ".$vif;
-		} else {
-			print FD ", ".$vif;
-		}
-	}
-	if ($vifcount >= 0) {
-		print FD " ]"."\n";
-	}
-	#==========================================
-	# xen console
-	#------------------------------------------
-	if ($text eq "XEN") {
-		print FD 'root="'.$part.' ro"'."\n";
-		print FD 'extra=" xencons=tty "'."\n";
-	}
-	close FD;
-	$kiwi -> done();
-	return $dest;
-}
-
-#==========================================
-# buildVMwareConfig
-#------------------------------------------
-sub buildVMwareConfig {
-	my $this   = shift;
-	my $dest   = shift;
-	my $name   = shift;
-	my $vmwref = shift;
-	my $kiwi   = $this->{kiwi};
-	my $arch   = $this->{arch};
-	my $file   = $dest."/".$name->{systemImage}.".vmx";
-	my $image  = $name->{systemImage};
-	my %vmwconfig = %{$vmwref};
-	$kiwi -> info ("Creating image VMware configuration file...");
-	if (! %vmwconfig) {
-		$kiwi -> skipped ();
-		$kiwi -> warning ("Missing VMware virtualisation config data");
-		$kiwi -> skipped ();
-		return $dest;
-	}
-	if (! open (FD,">$file")) {
-		$kiwi -> failed ();
-		$kiwi -> error  ("Couldn't create xenconfig file: $!");
-		$kiwi -> failed ();
-		return undef;
-	}
-	#==========================================
-	# global setup
-	#------------------------------------------
-	print FD '#!/usr/bin/env vmware'."\n";
-	print FD 'config.version = "8"'."\n";
-	print FD 'tools.syncTime = "true"'."\n";
-	print FD 'uuid.action = "create"'."\n";
-	if ($vmwconfig{vmware_hwver}) {
-		print FD 'virtualHW.version = "'.$vmwconfig{vmware_hwver}.'"'."\n";
-	} else {
-		print FD 'virtualHW.version = "4"'."\n";
-	}
-	print FD 'displayName = "'.$name->{systemImage}.'"'."\n";
-	print FD 'memsize = "'.$vmwconfig{vmware_memory}.'"'."\n";
-	print FD 'guestOS = "'.$vmwconfig{vmware_guest}.'"'."\n";
-	#==========================================
-	# storage setup
-	#------------------------------------------
-	if (defined $vmwconfig{vmware_disktype}) {
-		my $type   = $vmwconfig{vmware_disktype};
-		my $device = $vmwconfig{vmware_disktype}.$vmwconfig{vmware_diskid};
-		if ($type eq "ide") {
-			# IDE Interface...
-			print FD $device.':0.present = "true"'."\n";
-			print FD $device.':0.fileName= "'.$image.'.vmdk"'."\n";
-			print FD $device.':0.redo = ""'."\n";
-		} else {
-			# SCSI Interface...
-			print FD $device.'.present = "true"'."\n";
-			print FD $device.'.sharedBus = "none"'."\n";
-			print FD $device.'.virtualDev = "lsilogic"'."\n";
-			print FD $device.':0.present = "true"'."\n";
-			print FD $device.':0.fileName = "'.$image.'.vmdk"'."\n";
-			print FD $device.':0.deviceType = "scsi-hardDisk"'."\n";
-		}
-	}
-	#==========================================
-	# network setup
-	#------------------------------------------
-	if (defined $vmwconfig{vmware_niciface}) {
-		my $driver = $vmwconfig{vmware_nicdriver};
-		my $mode   = $vmwconfig{vmware_nicmode};
-		my $nic    = "ethernet".$vmwconfig{vmware_niciface};
-		print FD $nic.'.present = "true"'."\n";
-		print FD $nic.'.virtualDev = "'.$driver.'"'."\n";
-		print FD $nic.'.addressType = "generated"'."\n";
-		print FD $nic.'.connectionType = "'.$mode.'"'."\n";
-		if ($vmwconfig{vmware_arch} =~ /64$/) {
-			print FD $nic.'.allow64bitVmxnet = "true"'."\n";
-		}
-	}
-	#==========================================
-	# CD/DVD drive setup
-	#------------------------------------------
-	if (defined $vmwconfig{vmware_cdtype}) {
-		my $device = $vmwconfig{vmware_cdtype}.$vmwconfig{vmware_cdid};
-		print FD $device.':0.present = "true"'."\n";
-		print FD $device.':0.deviceType = "cdrom-raw"'."\n";
-		print FD $device.':0.autodetect = "true"'."\n";
-		print FD $device.':0.startConnected = "true"'."\n";
-	}
-	#==========================================
-	# USB setup
-	#------------------------------------------
-	if (defined $vmwconfig{vmware_usb}) {
-		print FD 'usb.present = "true"'."\n";
-	}
-	#==========================================
-	# Power Management setup
-	#------------------------------------------
-	print FD 'priority.grabbed = "normal"'."\n";
-	print FD 'priority.ungrabbed = "normal"'."\n";
-	print FD 'powerType.powerOff = "soft"'."\n";
-	print FD 'powerType.powerOn  = "soft"'."\n";
-	print FD 'powerType.suspend  = "soft"'."\n";
-	print FD 'powerType.reset    = "soft"'."\n";
-	close FD;
-	chmod 0755,$file;
-	$kiwi -> done();
-	return $file;
-}
-
-#==========================================
 # buildMD5Sum
 #------------------------------------------
 sub buildMD5Sum {
diff --git a/modules/KIWIImageFormat.pm b/modules/KIWIImageFormat.pm
new file mode 100644
index 0000000..4e39678
--- /dev/null
+++ b/modules/KIWIImageFormat.pm
@@ -0,0 +1,574 @@
+#================
+# FILE          : KIWIImageFormat.pm
+#----------------
+# PROJECT       : OpenSUSE Build-Service
+# COPYRIGHT     : (c) 2006 SUSE LINUX Products GmbH, Germany
+#               :
+# AUTHOR        : Marcus Schaefer <ms at suse.de>
+#               :
+# BELONGS TO    : Operating System images
+#               :
+# DESCRIPTION   : This module is used to provide methods for
+#               : creating image output formats based on the
+#               : raw output file like vmdk, ovf, hyperV
+#               : and more
+#               : 
+#               :
+# STATUS        : Development
+#----------------
+package KIWIImageFormat;
+#==========================================
+# Modules
+#------------------------------------------
+use strict;
+use KIWILog;
+use KIWIQX;
+use File::Basename;
+use KIWIBoot;
+
+#==========================================
+# Constructor
+#------------------------------------------
+sub new {
+	# ...
+	# Create a new KIWIImageFormat object which is used
+	# to gather information required for the format conversion 
+	# ---
+	#==========================================
+	# Object setup
+	#------------------------------------------
+	my $this  = {};
+	my $class = shift;
+	bless $this,$class;
+	#==========================================
+	# Module Parameters [ mandatory ]
+	#------------------------------------------
+	my $kiwi   = shift;
+	my $image  = shift;
+	#==========================================
+	# Module Parameters [ optional ]
+	#------------------------------------------
+	my $format = shift;
+	my $xml    = shift;
+	#==========================================
+	# Constructor setup
+	#------------------------------------------
+	my $code;
+	my $data;
+	if (! defined $kiwi) {
+		$kiwi = new KIWILog();
+	}
+	#==========================================
+	# check image file
+	#------------------------------------------
+	if (! -f $image) {
+		$kiwi -> error ("no such image file: $image");
+		$kiwi -> failed ();
+		return undef;
+	} 
+	#==========================================
+	# read XML if required
+	#------------------------------------------
+	if (! defined $xml) {
+		my $boot = new KIWIBoot (
+			$kiwi,undef,$image,undef,undef,undef,\@main::ProfilesOrig
+		);
+		if ($boot) {
+			$xml = $boot->{xml};
+			$boot -> cleanLoop();
+			$boot -> cleanTmp();
+		}
+		if (! defined $xml) {
+			$kiwi -> error  ("Can't load XML configuration, not an image ?");
+			$kiwi -> failed ();
+			return undef;
+		}
+	}
+	#==========================================
+	# Read some XML data
+	#------------------------------------------
+	my %xenref = $xml -> getXenConfig();
+	my %vmwref = $xml -> getVMwareConfig();
+	#==========================================
+	# Store object data
+	#------------------------------------------
+	$this->{xenref}  = \%xenref;
+	$this->{vmwref}  = \%vmwref;
+	$this->{kiwi}    = $kiwi;
+	$this->{xml}     = $xml;
+	$this->{format}  = $format;
+	$this->{image}   = $image;
+	return $this;
+}
+
+#==========================================
+# createFormat
+#------------------------------------------
+sub createFormat {
+	my $this   = shift;
+	my $kiwi   = $this->{kiwi};
+	my $format = $this->{format};
+	my $image  = $this->{image};
+	#==========================================
+	# check if format is a disk
+	#------------------------------------------
+	if ($format) {
+		my $data = qxx ("parted $image print 2>&1");
+		my $code = $? >> 8;
+		if ($code != 0) {
+			$kiwi -> error  ("system image is not a disk");
+			$kiwi -> failed ();
+			return undef
+		}
+	}
+	#==========================================
+	# convert disk into specified format
+	#------------------------------------------
+	if ($format eq "vmdk") {
+		return $this -> createVMDK();
+	} elsif ($format eq "ovf") {
+		return $this -> createOVF();
+	} elsif ($format eq "qcow2") {
+		return $this -> createQCOW2();
+	}
+	return undef;
+}
+
+#==========================================
+# createMaschineConfiguration
+#------------------------------------------
+sub createMaschineConfiguration {
+	my $this   = shift;
+	my $kiwi   = $this->{kiwi};
+	my $format = $this->{format};
+	my $xml    = $this->{xml};
+	my %type   = %{$xml -> getImageTypeAndAttributes()};
+	my $xenref = $this->{xenref};
+	my %xenc   = %{$xenref};
+	my $xend   = "dom0";
+	if (defined $xenc{xen_domain}) {
+		$xend = $xenc{xen_domain};
+	}
+	if (($type{type}) && ($type{type} eq "xen")) {
+		return $this -> createXENConfiguration();
+	} elsif (
+		($type{bootprofile}) && ($type{bootprofile} eq "xen") &&
+		($xend eq "domU")
+	) {
+		return $this -> createXENConfiguration();
+	} elsif ($format eq "vmdk") {
+		return $this -> createVMwareConfiguration();
+	} elsif ($format eq "ovf") {
+		return $this -> createOVFConfiguration();
+	}
+	return undef;
+}
+
+#==========================================
+# createOVF
+#------------------------------------------
+sub createOVF {
+	my $this   = shift;
+	my $kiwi   = $this->{kiwi};
+	my $format = $this->{format};
+	my $ovftool = "/usr/bin/ovftool";
+	my $vmdk;
+	my $vmxf;
+	my $source;
+	my $target;
+	#==========================================
+	# check for ovftool
+	#------------------------------------------
+	if (! -x $ovftool) {
+		$kiwi -> error  ("Can't find $ovftool, is it installed ?");
+		$kiwi -> failed ();
+		return undef;
+	}
+	#==========================================
+	# create vmdk first, required for ovf
+	#------------------------------------------
+	$this->{format}	= "vmdk";
+	$vmdk = $this->createVMDK();
+	$vmxf = $this->createMaschineConfiguration();
+	#==========================================
+	# create ovf from the vmdk
+	#------------------------------------------
+	if ((-e $vmdk) && (-e $vmxf)) {
+		$source = $vmxf;
+		$target = $vmxf;
+		$target =~ s/\.vmx$/\.$format/;
+		$this->{format} = $format;
+		$kiwi -> info ("Creating $format image");
+		# /.../
+		# temporary hack, because ovftool is not able to handle
+		# scsi-hardDisk correctly at the moment
+		# ---- beg ----
+		qxx ("sed -i -e 's;scsi-hardDisk;disk;' $source");
+		# ---- end ----
+		my $status = qxx ("rm -rf $target; mkdir -p $target 2>&1");
+		my $result = $? >> 8;
+		if ($result != 0) {
+			$kiwi -> failed ();
+			$kiwi -> error  ("Couldn't create OVF directory: $status");
+			$kiwi -> failed ();
+			return undef;
+		}
+		my $output = basename $target;
+		$status= qxx (
+			"$ovftool -o -q $source $target/$output 2>&1"
+		);
+		$result = $? >> 8;
+		# --- beg ----
+		qxx ("sed -i -e 's;disk;scsi-hardDisk;' $source");
+		qxx ("rm -rf $main::Destination/*.lck 2>&1");
+		# --- end ----
+		if ($result != 0) {
+			$kiwi -> failed ();
+			$kiwi -> error  ("Couldn't create OVF image: $status");
+			$kiwi -> failed ();
+			return undef;
+		}
+		$kiwi -> done();
+	}
+	return $target;
+}
+
+#==========================================
+# createVMDK
+#------------------------------------------
+sub createVMDK {
+	my $this   = shift;
+	my $kiwi   = $this->{kiwi};
+	my $format = $this->{format};
+	my %vmwc   = %{$this->{vmwref}};
+	my $source = $this->{image};
+	my $target = $source;
+	my $convert;
+	my $status;
+	my $result;
+	$kiwi -> info ("Creating $format image");
+	$target  =~ s/\.raw$/\.$format/;
+	$convert = "convert -f raw $source -O $format";
+	if (($vmwc{vmware_disktype}) && ($vmwc{vmware_disktype}=~/^scsi/)) {
+		$status = qxx ("qemu-img $convert -s $target 2>&1");
+	} else {
+		$status = qxx ("qemu-img $convert $target 2>&1");
+	}
+	$result = $? >> 8;
+	if ($result != 0) {
+		$kiwi -> failed ();
+		$kiwi -> error  ("Couldn't create $format image: $status");
+		$kiwi -> failed ();
+		return undef;
+	}
+	$kiwi -> done ();
+	return $target;
+}
+
+#==========================================
+# createQCOW2
+#------------------------------------------
+sub createQCOW2 {
+	my $this = shift;
+	my $kiwi   = $this->{kiwi};
+	my $format = $this->{format};
+	my $source = $this->{image};
+	my $target = $source;
+	my $status;
+	my $result;
+	$kiwi -> info ("Creating $format image");
+	$target  =~ s/\.raw$/\.$format/;
+	$status = qxx ("qemu-img -f raw $source -O $format $target 2>&1");
+	$result = $? >> 8;
+	if ($result != 0) {
+		$kiwi -> failed ();
+		$kiwi -> error  ("Couldn't create $format image: $status");
+		$kiwi -> failed ();
+		return undef;
+	}
+	$kiwi -> done ();
+	return $target;
+}
+
+#==========================================
+# createXENConfiguration
+#------------------------------------------
+sub createXENConfiguration {
+	my $this   = shift;
+	my $kiwi   = $this->{kiwi};
+	my $xml    = $this->{xml};
+	my $xenref = $this->{xenref};
+	my %type   = %{$xml -> getImageTypeAndAttributes()};
+	my $dest   = dirname  $this->{image};
+	my $base   = basename $this->{image};
+	my %xenconfig = %{$xenref};
+	my $format;
+	my $file;
+	my $FD;
+	$kiwi -> info ("Creating image Xen configuration file...");
+	#==========================================
+	# setup config file name from image name
+	#------------------------------------------
+	my $image = $base;
+	if ($base =~ /(.*)\.(.*?)$/) {
+		$image  = $1;
+		$format = $2;
+		$base   = $image.".xenconfig";
+	}
+	$file = $dest."/".$base;
+	#==========================================
+	# find kernel
+	#------------------------------------------
+	my $kernel;
+	my $initrd;
+	foreach my $k (glob ($dest."/*.kernel")) {
+		if (-l $k) {
+			$kernel = readlink ($k);
+			$kernel = basename ($kernel);
+			last;
+		}
+	}
+	if (! -e "$dest/$kernel") {
+		$kiwi -> skipped ();
+		$kiwi -> warning ("Can't find kernel in $dest");
+		$kiwi -> skipped ();
+		return $file;
+	}
+	#==========================================
+	# find initrd
+	#------------------------------------------
+	foreach my $i (glob ($dest."/*.splash.gz")) {
+		$initrd = $i;
+		$initrd = basename ($initrd);
+		last;
+	}
+	if (! -e "$dest/$initrd") {
+		$kiwi -> skipped ();
+		$kiwi -> warning ("Can't find initrd in $dest");
+		$kiwi -> skipped ();
+		return $file;
+	}
+	#==========================================
+	# check XML configuration data
+	#------------------------------------------
+	if ((! %xenconfig) || (! $xenconfig{xen_diskdevice})) {
+		$kiwi -> skipped ();
+		$kiwi -> warning ("Not enough or missing Xen machine config data");
+		$kiwi -> skipped ();
+		return $file;
+	}
+	#==========================================
+	# Create config file
+	#------------------------------------------
+	if (! open ($FD,">$file")) {
+		$kiwi -> skipped ();
+		$kiwi -> warning  ("Couldn't create xenconfig file: $!");
+		$kiwi -> skipped ();
+		return $file;
+	}
+	#==========================================
+	# global setup
+	#------------------------------------------
+	my $device = $xenconfig{xen_diskdevice};
+	$device =~ s/\/dev\///;
+	my $part = $device."1";
+	if ($type{type} eq "xen") {
+		$device = $device."1";
+	}
+	my $memory = $xenconfig{xen_memory};
+	if ($type{type} ne "xen") {
+		$image .= ".".$format;
+	}
+	print $FD '#  -*- mode: python; -*-'."\n";
+	print $FD "name=\"".$this->{xml}->getImageDisplayName()."\"\n";
+	if ($type{type} eq "xen") {
+		print $FD 'kernel="'.$kernel.'"'."\n";
+		print $FD 'ramdisk="'.$initrd.'"'."\n";
+	}
+	print $FD 'memory='.$memory."\n";
+	if ($type{type} ne "xen") {
+		my $tap = $format;
+		if ($tap eq "raw") {
+			$tap = "aio";
+		}
+		print $FD 'disk=[ "tap:'.$tap.':'.$image.','.$device.',w" ]'."\n";
+	} else {
+		print $FD 'disk=[ "file:'.$image.','.$part.',w" ]'."\n";
+	}
+	#==========================================
+	# network setup
+	#------------------------------------------
+	my $vifcount = -1;
+	foreach my $bname (keys %{$xenconfig{xen_bridge}}) {
+		$vifcount++;
+		my $mac = $xenconfig{xen_bridge}{$bname};
+		my $vif = '"bridge='.$bname.'"';
+		if ($bname eq "undef") {
+			$vif = '""';
+		}
+		if ($mac) {
+			$vif = '"mac='.$mac.',bridge='.$bname.'"';
+			if ($bname eq "undef") {
+				$vif = '"mac='.$mac.'"';
+			}
+		}
+		if ($vifcount == 0) {
+			print $FD "vif=[ ".$vif;
+		} else {
+			print $FD ", ".$vif;
+		}
+	}
+	if ($vifcount >= 0) {
+		print $FD " ]"."\n";
+	}
+	#==========================================
+	# xen console
+	#------------------------------------------
+	if ($type{type} eq "xen") {
+		print $FD 'root="'.$part.' ro"'."\n";
+		print $FD 'extra=" xencons=tty "'."\n";
+	}
+	close $FD;
+	$kiwi -> done();
+	return $file;
+}
+
+#==========================================
+# createVMwareConfiguration
+#------------------------------------------
+sub createVMwareConfiguration {
+	my $this   = shift;
+	my $kiwi   = $this->{kiwi};
+	my $xml    = $this->{xml};
+	my $vmwref = $this->{vmwref};
+	my $dest   = dirname  $this->{image};
+	my $base   = basename $this->{image};
+	my $file;
+	my $FD;
+	$kiwi -> info ("Creating image VMware configuration file...");
+	#==========================================
+	# setup config file name from image name
+	#------------------------------------------
+	my $image = $base;
+	if ($base =~ /(.*)\.(.*?)$/) {
+		$image = $1;
+		$base  = $image.".vmx";
+	}
+	$file = $dest."/".$base;
+	#==========================================
+	# check XML configuration data
+	#------------------------------------------
+	my %vmwconfig = %{$vmwref};
+	if ((! %vmwconfig) || (! $vmwconfig{vmware_disktype})) {
+		$kiwi -> skipped ();
+		$kiwi -> warning ("Not enough or Missing VMware machine config data");
+		$kiwi -> skipped ();
+		return $dest;
+	}
+	#==========================================
+	# Create config file
+	#------------------------------------------
+	if (! open ($FD,">$file")) {
+		$kiwi -> skipped ();
+		$kiwi -> warning ("Couldn't create VMware config file: $!");
+		$kiwi -> skipped ();
+		return $file;
+	}
+	#==========================================
+	# global setup
+	#------------------------------------------
+	print $FD '#!/usr/bin/env vmware'."\n";
+	print $FD 'config.version = "8"'."\n";
+	print $FD 'tools.syncTime = "true"'."\n";
+	print $FD 'uuid.action = "create"'."\n";
+	if ($vmwconfig{vmware_hwver}) {
+		print $FD 'virtualHW.version = "'.$vmwconfig{vmware_hwver}.'"'."\n";
+	} else {
+		print $FD 'virtualHW.version = "4"'."\n";
+	}
+	print $FD 'displayName = "'.$image.'"'."\n";
+	print $FD 'memsize = "'.$vmwconfig{vmware_memory}.'"'."\n";
+	print $FD 'guestOS = "'.$vmwconfig{vmware_guest}.'"'."\n";
+	#==========================================
+	# storage setup
+	#------------------------------------------
+	if (defined $vmwconfig{vmware_disktype}) {
+		my $type   = $vmwconfig{vmware_disktype};
+		my $device = $vmwconfig{vmware_disktype}.$vmwconfig{vmware_diskid};
+		if ($type eq "ide") {
+			# IDE Interface...
+			print $FD $device.':0.present = "true"'."\n";
+			print $FD $device.':0.fileName= "'.$image.'.vmdk"'."\n";
+			print $FD $device.':0.redo = ""'."\n";
+		} else {
+			# SCSI Interface...
+			print $FD $device.'.present = "true"'."\n";
+			print $FD $device.'.sharedBus = "none"'."\n";
+			print $FD $device.'.virtualDev = "lsilogic"'."\n";
+			print $FD $device.':0.present = "true"'."\n";
+			print $FD $device.':0.fileName = "'.$image.'.vmdk"'."\n";
+			print $FD $device.':0.deviceType = "scsi-hardDisk"'."\n";
+		}
+	}
+	#==========================================
+	# network setup
+	#------------------------------------------
+	if (defined $vmwconfig{vmware_niciface}) {
+		my $driver = $vmwconfig{vmware_nicdriver};
+		my $mode   = $vmwconfig{vmware_nicmode};
+		my $nic    = "ethernet".$vmwconfig{vmware_niciface};
+		print $FD $nic.'.present = "true"'."\n";
+		print $FD $nic.'.addressType = "generated"'."\n";
+		if ($driver) {
+			print $FD $nic.'.virtualDev = "'.$driver.'"'."\n";
+		}
+		if ($mode) {
+			print $FD $nic.'.connectionType = "'.$mode.'"'."\n";
+		}
+		if ($vmwconfig{vmware_arch} =~ /64$/) {
+			print $FD $nic.'.allow64bitVmxnet = "true"'."\n";
+		}
+	}
+	#==========================================
+	# CD/DVD drive setup
+	#------------------------------------------
+	if (defined $vmwconfig{vmware_cdtype}) {
+		my $device = $vmwconfig{vmware_cdtype}.$vmwconfig{vmware_cdid};
+		print $FD $device.':0.present = "true"'."\n";
+		print $FD $device.':0.deviceType = "cdrom-raw"'."\n";
+		print $FD $device.':0.autodetect = "true"'."\n";
+		print $FD $device.':0.startConnected = "true"'."\n";
+	}
+	#==========================================
+	# USB setup
+	#------------------------------------------
+	if (defined $vmwconfig{vmware_usb}) {
+		print $FD 'usb.present = "true"'."\n";
+	}
+	#==========================================
+	# Power Management setup
+	#------------------------------------------
+	print $FD 'priority.grabbed = "normal"'."\n";
+	print $FD 'priority.ungrabbed = "normal"'."\n";
+	print $FD 'powerType.powerOff = "soft"'."\n";
+	print $FD 'powerType.powerOn  = "soft"'."\n";
+	print $FD 'powerType.suspend  = "soft"'."\n";
+	print $FD 'powerType.reset    = "soft"'."\n";
+	close $FD;
+	chmod 0755,$file;
+	$kiwi -> done();
+	return $file;
+}
+
+#==========================================
+# createOVFConfiguration
+#------------------------------------------
+sub createOVFConfiguration {
+	# TODO
+	my $this = shift;
+	return $this;
+}
+
+1;
+
+# vim: set noexpandtab:
diff --git a/modules/KIWISchema.rnc b/modules/KIWISchema.rnc
index aa57049..57770d5 100644
--- a/modules/KIWISchema.rnc
+++ b/modules/KIWISchema.rnc
@@ -26,7 +26,7 @@ db:info [
 	db:releaseinfo [
 		"$Id: kiwi.rnc 2957 2008-01-11 12:53:39Z thomas-schraitle $"
 	]
-	db:releaseinfo [ "RNC Schema Version 4.6" ]
+	db:releaseinfo [ "RNC Schema Version 4.7" ]
 	db:pubdate [ "START" ]
 	db:pubdate [ "2008-01-08" ]
 ]
@@ -62,7 +62,7 @@ div {
 		attribute inherit { text }
 	k.image.schemaversion.attribute =
 		## The allowed Schema version (fixed value)
-		attribute schemaversion { "4.6" }
+		attribute schemaversion { "4.7" }
 	k.image.kiwirevision.attribute =
 		## A kiwi SVN revision number which is known to build
 		## a working image from this description. If the kiwi SVN
@@ -1364,12 +1364,16 @@ div {
 			"ext2" | "ext3" | "ext4" | "reiserfs"
 		}
 	k.type.format.attribute =
-		## Specifies the format of the virtual disk. This applies to the
-		## vmx/oem types only.
+		## Specifies the format of the virtual disk.
 		attribute format {
-			"bochs" | "cloop" | "cow" | "dmg" | "iso" | "ovf" | "qcow" |
-			"qcow2" | "usb" | "vmdk" | "vpc" | "vvfat"
-		}
+			"ovf" | "qcow2" | "vmdk"
+		}
+	k.type.installiso.attribute =
+		## Specifies if a install iso should be created (oem only)
+		attribute installiso { xsd:boolean }
+	k.type.installstick.attribute =
+		## Specifies if a install stick should be created (oem only)
+		attribute installstick { xsd:boolean }
 	k.type.primary.attribute =
 		## Specifies the primary type (choose KIWI option type)
 		attribute primary { xsd:boolean }
@@ -1405,6 +1409,8 @@ div {
 		k.type.fsreadwrite.attribute? &
 		k.type.baseroot.attribute? &
 		k.type.format.attribute? &
+		k.type.installiso.attribute? &
+		k.type.installstick.attribute? &
 		k.type.primary.attribute? &
 		k.type.kernelcmdline.attribute?
 	k.type =
@@ -1417,8 +1423,7 @@ div {
 			k.pxedeploy? &
 			k.size? &
 			k.split? &
-			k.vmwareconfig? &
-			k.xenconfig?
+			k.machine?
 		}
 }
 
@@ -1568,108 +1573,77 @@ div {
 }
 
 #==========================================
-# common element <vmwarenic>
+# common element <vmnic>
 #
 div {
-	k.vmwarenic.driver.attribute =
+	k.vmnic.driver.attribute =
 		## The driver used for the VM network interface
 		attribute driver { text }
-	k.vmwarenic.interface.attribute =
+	k.vmnic.interface.attribute =
 		## The interface ID for the VM network interface
-		attribute interface { xsd:nonNegativeInteger }
-	k.vmwarenic.mode.attribute =
+		attribute interface { text }
+	k.vmnic.mode.attribute =
 		## The VM network mode
 		attribute mode { text }
-	k.vmwarenic.attlist =
-		k.vmwarenic.driver.attribute &
-		k.vmwarenic.interface.attribute &
-		k.vmwarenic.mode.attribute
-	k.vmwarenic =
-		## The VMware network interface definition
-		element vmwarenic {
-			k.vmwarenic.attlist &
+	k.vmnic.mac.attribute =
+		## The VM mac address
+		attribute mac { text }
+	k.vmnic.attlist =
+		k.vmnic.driver.attribute? &
+		k.vmnic.interface.attribute &
+		k.vmnic.mode.attribute? &
+		k.vmnic.mac.attribute?
+	k.vmnic =
+		## The VM network interface definition
+		element vmnic {
+			k.vmnic.attlist &
 			empty
 		}
 }
 
 #==========================================
-# common element <vmwaredisk>
+# common element <vmdisk>
 #
 div {
-	k.vmwaredisk.controller.attribute =
-		## The disk controller used for the VMware guest
+	k.vmdisk.controller.attribute =
+		## The disk controller used for the VM guest
 		attribute controller { "ide" | "scsi" }
-	k.vmwaredisk.id.attribute =
-		## The disk ID for the VM disk
+	k.vmdisk.id.attribute =
+		## The disk ID / device for the VM disk
 		attribute id { xsd:nonNegativeInteger }
-	k.vmwaredisk.attlist =
-		k.vmwaredisk.controller.attribute &
-		k.vmwaredisk.id.attribute
-	k.vmwaredisk =
-		## The VMware disk definition. You can setup either a
-		## scsi disk or an ide disk
-		element vmwaredisk {
-			k.vmwaredisk.attlist &
+	k.vmdisk.device.attribute =
+		## The disk device to appear in the guest (xen only)
+		attribute device { text }
+	k.vmdisk.attlist =
+		k.vmdisk.controller.attribute &
+		k.vmdisk.id.attribute &
+		k.vmdisk.device.attribute?
+	k.vmdisk =
+		## The VM disk definition.
+		element vmdisk {
+			k.vmdisk.attlist &
 			empty
 		}
 }
 
 #==========================================
-# common element <vmwarecdrom>
+# common element <vmdvd>
 #
 div {
-	k.vmwarecdrom.controller.attribute =
-		## The CD/DVD controller used for the VMware guest
+	k.vmdvd.controller.attribute =
+		## The CD/DVD controller used for the VM guest
 		attribute controller { "ide" | "scsi" }
-	k.vmwarecdrom.id.attribute =
+	k.vmdvd.id.attribute =
 		## The CD/DVD ID for the VM CD rom drive
 		attribute id { xsd:nonNegativeInteger }
-	k.vmwarecdrom.attlist =
-		k.vmwarecdrom.controller.attribute &
-		k.vmwarecdrom.id.attribute
-	k.vmwarecdrom =
-		## The VMware CD/DVD drive definition. You can setup either a
+	k.vmdvd.attlist =
+		k.vmdvd.controller.attribute &
+		k.vmdvd.id.attribute
+	k.vmdvd =
+		## The VM CD/DVD drive definition. You can setup either a
 		## scsi CD or an ide CD drive
-		element vmwarecdrom {
-			k.vmwarecdrom.attlist &
-			empty
-		}
-}
-
-#==========================================
-# common element <xendisk>
-#
-div {
-	k.xendisk.device.attribute =
-		## The disk device to appear in the Xen guest
-		attribute device { text }
-	k.xendisk.attlist =
-		k.xendisk.device.attribute
-	k.xendisk =
-		## The Xen disk device definition.
-		element xendisk {
-			k.xendisk.attlist &
-			empty
-		}
-}
-
-#==========================================
-# common element <xenbridge>
-#
-div {
-	k.xenbridge.mac.attribute =
-		## The Mac address to assign to the virtual interface
-		attribute mac { text }
-	k.xenbridge.name.attribute =
-		## The Xen bridged interface name
-		attribute name { text }
-	k.xenbridge.attlist =
-		k.xenbridge.mac.attribute ? &
-		k.xenbridge.name.attribute
-	k.xenbridge =
-		## The VMware network interface definition
-		element xenbridge {
-			k.xenbridge.attlist &
+		element vmdvd {
+			k.vmdvd.attlist &
 			empty
 		}
 }
@@ -2041,73 +2015,44 @@ div {
 }
 
 #==========================================
-# main block: <vmwareconfig>
+# main block: <machine>
 #
 div {
-	k.vmwareconfig.arch.attribute = 
-		## the VMware architecture type
+	k.machine.arch.attribute = 
+		## the VM architecture type
 		attribute arch { "ix86" | "x86_64" | "%arch" }
-	k.vmwareconfig.HWversion.attribute =
-		## The virtual HW version number for the VMware configuration
+	k.machine.HWversion.attribute =
+		## The virtual HW version number for the VM configuration
 		attribute HWversion { xsd:integer }
-	k.vmwareconfig.guestOS.attribute =
-		## the virtual guestOS identification string for VMware
+	k.machine.guestOS.attribute =
+		## the virtual guestOS identification string for the VM
 		attribute guestOS { text }
-	k.vmwareconfig.memory.attribute =
+	k.machine.memory.attribute =
 		## The memory setup for the guest VM.
 		attribute memory { text }
-	k.vmwareconfig.usb.attribute =
-		## Activate/Deactivate usb controller for VMware
-		attribute usb { xsd:boolean }
-	k.vmwareconfig.attlist =
-		k.vmwareconfig.arch.attribute? &
-		k.vmwareconfig.HWversion.attribute? &
-		k.vmwareconfig.guestOS.attribute? &
-		k.vmwareconfig.usb.attribute? &
-		k.vmwareconfig.memory.attribute
-	k.vmwareconfig =
-		## specifies the VMware configuration sections
-		[
-		db:para [
-			"The vmwareconfig element specifies the VMware guest\x{a}"~
-			"configuration options which are used by the VMware\x{a}"~
-			"virtual machine when running the image."
-		]
-		]
-		element vmwareconfig {
-			k.vmwareconfig.attlist &
-			k.vmwarenic ? &
-			k.vmwaredisk ? &
-			k.vmwarecdrom ?
-		}
-}
-
-#==========================================
-# main block: <xenconfig>
-#
-div {
-	k.xenconfig.memory.attribute =
-		## The memory setup for the Xen guest.
-		attribute memory { text }
-	k.xenconfig.domain.attribute =
-		## The type of Xen domain to create (dom0 or domU)
+	k.machine.domain.attribute =
+		## The domain setup for the VM (xen only)
 		attribute domain { "dom0" | "domU" }
-	k.xenconfig.attlist =
-		k.xenconfig.memory.attribute ? &
-		k.xenconfig.domain.attribute ?
-	k.xenconfig =
-		## specifies the Xen configuration sections
+	k.machine.attlist =
+		k.machine.arch.attribute? &
+		k.machine.HWversion.attribute? &
+		k.machine.guestOS.attribute? &
+		k.machine.memory.attribute? &
+		k.machine.domain.attribute?
+	k.machine =
+		## specifies the VM configuration sections
 		[
 		db:para [
-			"The xenconfig element specifies the Xen guest\x{a}"~
-			"configuration options which are used by the Xen\x{a}"~
-			"para virtual machine when running the image."
+			"The machine element specifies the VM guest\x{a}"~
+			"configuration options which are used by the\x{a}"~
+			"virtual machine when running the image."
 		]
 		]
-		element xenconfig {
-			k.xenconfig.attlist &
-			k.xendisk ? &
-			k.xenbridge*
+		element machine {
+			k.machine.attlist &
+			k.vmnic ? &
+			k.vmdisk ? &
+			k.vmdvd ?
 		}
 }
 
diff --git a/modules/KIWISchema.rng b/modules/KIWISchema.rng
index e67a1dc..9fe765d 100644
--- a/modules/KIWISchema.rng
+++ b/modules/KIWISchema.rng
@@ -23,7 +23,7 @@
 <grammar xmlns:db="http://docbook.org/ns/docbook" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <db:info>
     <db:releaseinfo>$Id: kiwi.rnc 2957 2008-01-11 12:53:39Z thomas-schraitle $</db:releaseinfo>
-    <db:releaseinfo>RNC Schema Version 4.6</db:releaseinfo>
+    <db:releaseinfo>RNC Schema Version 4.7</db:releaseinfo>
     <db:pubdate>START</db:pubdate>
     <db:pubdate>2008-01-08</db:pubdate>
   </db:info>
@@ -87,7 +87,7 @@ the package Information is inherited</a:documentation>
     <define name="k.image.schemaversion.attribute">
       <attribute name="schemaversion">
         <a:documentation>The allowed Schema version (fixed value)</a:documentation>
-        <value>4.6</value>
+        <value>4.7</value>
       </attribute>
     </define>
     <define name="k.image.kiwirevision.attribute">
@@ -1895,24 +1895,26 @@ file for write operations</a:documentation>
     </define>
     <define name="k.type.format.attribute">
       <attribute name="format">
-        <a:documentation>Specifies the format of the virtual disk. This applies to the
-vmx/oem types only.</a:documentation>
+        <a:documentation>Specifies the format of the virtual disk.</a:documentation>
         <choice>
-          <value>bochs</value>
-          <value>cloop</value>
-          <value>cow</value>
-          <value>dmg</value>
-          <value>iso</value>
           <value>ovf</value>
-          <value>qcow</value>
           <value>qcow2</value>
-          <value>usb</value>
           <value>vmdk</value>
-          <value>vpc</value>
-          <value>vvfat</value>
         </choice>
       </attribute>
     </define>
+    <define name="k.type.installiso.attribute">
+      <attribute name="installiso">
+        <a:documentation>Specifies if a install iso should be created (oem only)</a:documentation>
+        <data type="boolean"/>
+      </attribute>
+    </define>
+    <define name="k.type.installstick.attribute">
+      <attribute name="installstick">
+        <a:documentation>Specifies if a install stick should be created (oem only)</a:documentation>
+        <data type="boolean"/>
+      </attribute>
+    </define>
     <define name="k.type.primary.attribute">
       <attribute name="primary">
         <a:documentation>Specifies the primary type (choose KIWI option type)</a:documentation>
@@ -2010,6 +2012,12 @@ vmx/oem types only.</a:documentation>
           <ref name="k.type.format.attribute"/>
         </optional>
         <optional>
+          <ref name="k.type.installiso.attribute"/>
+        </optional>
+        <optional>
+          <ref name="k.type.installstick.attribute"/>
+        </optional>
+        <optional>
           <ref name="k.type.primary.attribute"/>
         </optional>
         <optional>
@@ -2041,10 +2049,7 @@ vmx/oem types only.</a:documentation>
             <ref name="k.split"/>
           </optional>
           <optional>
-            <ref name="k.vmwareconfig"/>
-          </optional>
-          <optional>
-            <ref name="k.xenconfig"/>
+            <ref name="k.machine"/>
           </optional>
         </interleave>
       </element>
@@ -2267,38 +2272,49 @@ compressed filesystem.</db:para>
   </div>
   <!--
     ==========================================
-    common element <vmwarenic>
+    common element <vmnic>
     
   -->
   <div>
-    <define name="k.vmwarenic.driver.attribute">
+    <define name="k.vmnic.driver.attribute">
       <attribute name="driver">
         <a:documentation>The driver used for the VM network interface</a:documentation>
       </attribute>
     </define>
-    <define name="k.vmwarenic.interface.attribute">
+    <define name="k.vmnic.interface.attribute">
       <attribute name="interface">
         <a:documentation>The interface ID for the VM network interface</a:documentation>
-        <data type="nonNegativeInteger"/>
       </attribute>
     </define>
-    <define name="k.vmwarenic.mode.attribute">
+    <define name="k.vmnic.mode.attribute">
       <attribute name="mode">
         <a:documentation>The VM network mode</a:documentation>
       </attribute>
     </define>
-    <define name="k.vmwarenic.attlist">
+    <define name="k.vmnic.mac.attribute">
+      <attribute name="mac">
+        <a:documentation>The VM mac address</a:documentation>
+      </attribute>
+    </define>
+    <define name="k.vmnic.attlist">
       <interleave>
-        <ref name="k.vmwarenic.driver.attribute"/>
-        <ref name="k.vmwarenic.interface.attribute"/>
-        <ref name="k.vmwarenic.mode.attribute"/>
+        <optional>
+          <ref name="k.vmnic.driver.attribute"/>
+        </optional>
+        <ref name="k.vmnic.interface.attribute"/>
+        <optional>
+          <ref name="k.vmnic.mode.attribute"/>
+        </optional>
+        <optional>
+          <ref name="k.vmnic.mac.attribute"/>
+        </optional>
       </interleave>
     </define>
-    <define name="k.vmwarenic">
-      <element name="vmwarenic">
-        <a:documentation>The VMware network interface definition</a:documentation>
+    <define name="k.vmnic">
+      <element name="vmnic">
+        <a:documentation>The VM network interface definition</a:documentation>
         <interleave>
-          <ref name="k.vmwarenic.attlist"/>
+          <ref name="k.vmnic.attlist"/>
           <empty/>
         </interleave>
       </element>
@@ -2306,37 +2322,44 @@ compressed filesystem.</db:para>
   </div>
   <!--
     ==========================================
-    common element <vmwaredisk>
+    common element <vmdisk>
     
   -->
   <div>
-    <define name="k.vmwaredisk.controller.attribute">
+    <define name="k.vmdisk.controller.attribute">
       <attribute name="controller">
-        <a:documentation>The disk controller used for the VMware guest</a:documentation>
+        <a:documentation>The disk controller used for the VM guest</a:documentation>
         <choice>
           <value>ide</value>
           <value>scsi</value>
         </choice>
       </attribute>
     </define>
-    <define name="k.vmwaredisk.id.attribute">
+    <define name="k.vmdisk.id.attribute">
       <attribute name="id">
-        <a:documentation>The disk ID for the VM disk</a:documentation>
+        <a:documentation>The disk ID / device for the VM disk</a:documentation>
         <data type="nonNegativeInteger"/>
       </attribute>
     </define>
-    <define name="k.vmwaredisk.attlist">
+    <define name="k.vmdisk.device.attribute">
+      <attribute name="device">
+        <a:documentation>The disk device to appear in the guest (xen only)</a:documentation>
+      </attribute>
+    </define>
+    <define name="k.vmdisk.attlist">
       <interleave>
-        <ref name="k.vmwaredisk.controller.attribute"/>
-        <ref name="k.vmwaredisk.id.attribute"/>
+        <ref name="k.vmdisk.controller.attribute"/>
+        <ref name="k.vmdisk.id.attribute"/>
+        <optional>
+          <ref name="k.vmdisk.device.attribute"/>
+        </optional>
       </interleave>
     </define>
-    <define name="k.vmwaredisk">
-      <element name="vmwaredisk">
-        <a:documentation>The VMware disk definition. You can setup either a
-scsi disk or an ide disk</a:documentation>
+    <define name="k.vmdisk">
+      <element name="vmdisk">
+        <a:documentation>The VM disk definition.</a:documentation>
         <interleave>
-          <ref name="k.vmwaredisk.attlist"/>
+          <ref name="k.vmdisk.attlist"/>
           <empty/>
         </interleave>
       </element>
@@ -2344,95 +2367,37 @@ scsi disk or an ide disk</a:documentation>
   </div>
   <!--
     ==========================================
-    common element <vmwarecdrom>
+    common element <vmdvd>
     
   -->
   <div>
-    <define name="k.vmwarecdrom.controller.attribute">
+    <define name="k.vmdvd.controller.attribute">
       <attribute name="controller">
-        <a:documentation>The CD/DVD controller used for the VMware guest</a:documentation>
+        <a:documentation>The CD/DVD controller used for the VM guest</a:documentation>
         <choice>
           <value>ide</value>
           <value>scsi</value>
         </choice>
       </attribute>
     </define>
-    <define name="k.vmwarecdrom.id.attribute">
+    <define name="k.vmdvd.id.attribute">
       <attribute name="id">
         <a:documentation>The CD/DVD ID for the VM CD rom drive</a:documentation>
         <data type="nonNegativeInteger"/>
       </attribute>
     </define>
-    <define name="k.vmwarecdrom.attlist">
+    <define name="k.vmdvd.attlist">
       <interleave>
-        <ref name="k.vmwarecdrom.controller.attribute"/>
-        <ref name="k.vmwarecdrom.id.attribute"/>
+        <ref name="k.vmdvd.controller.attribute"/>
+        <ref name="k.vmdvd.id.attribute"/>
       </interleave>
     </define>
-    <define name="k.vmwarecdrom">
-      <element name="vmwarecdrom">
-        <a:documentation>The VMware CD/DVD drive definition. You can setup either a
+    <define name="k.vmdvd">
+      <element name="vmdvd">
+        <a:documentation>The VM CD/DVD drive definition. You can setup either a
 scsi CD or an ide CD drive</a:documentation>
         <interleave>
-          <ref name="k.vmwarecdrom.attlist"/>
-          <empty/>
-        </interleave>
-      </element>
-    </define>
-  </div>
-  <!--
-    ==========================================
-    common element <xendisk>
-    
-  -->
-  <div>
-    <define name="k.xendisk.device.attribute">
-      <attribute name="device">
-        <a:documentation>The disk device to appear in the Xen guest</a:documentation>
-      </attribute>
-    </define>
-    <define name="k.xendisk.attlist">
-      <ref name="k.xendisk.device.attribute"/>
-    </define>
-    <define name="k.xendisk">
-      <element name="xendisk">
-        <a:documentation>The Xen disk device definition.</a:documentation>
-        <interleave>
-          <ref name="k.xendisk.attlist"/>
-          <empty/>
-        </interleave>
-      </element>
-    </define>
-  </div>
-  <!--
-    ==========================================
-    common element <xenbridge>
-    
-  -->
-  <div>
-    <define name="k.xenbridge.mac.attribute">
-      <attribute name="mac">
-        <a:documentation>The Mac address to assign to the virtual interface</a:documentation>
-      </attribute>
-    </define>
-    <define name="k.xenbridge.name.attribute">
-      <attribute name="name">
-        <a:documentation>The Xen bridged interface name</a:documentation>
-      </attribute>
-    </define>
-    <define name="k.xenbridge.attlist">
-      <interleave>
-        <optional>
-          <ref name="k.xenbridge.mac.attribute"/>
-        </optional>
-        <ref name="k.xenbridge.name.attribute"/>
-      </interleave>
-    </define>
-    <define name="k.xenbridge">
-      <element name="xenbridge">
-        <a:documentation>The VMware network interface definition</a:documentation>
-        <interleave>
-          <ref name="k.xenbridge.attlist"/>
+          <ref name="k.vmdvd.attlist"/>
           <empty/>
         </interleave>
       </element>
@@ -2950,13 +2915,13 @@ and setup the system disk</db:para>
   </div>
   <!--
     ==========================================
-    main block: <vmwareconfig>
+    main block: <machine>
     
   -->
   <div>
-    <define name="k.vmwareconfig.arch.attribute">
+    <define name="k.machine.arch.attribute">
       <attribute name="arch">
-        <a:documentation>the VMware architecture type</a:documentation>
+        <a:documentation>the VM architecture type</a:documentation>
         <choice>
           <value>ix86</value>
           <value>x86_64</value>
@@ -2964,110 +2929,67 @@ and setup the system disk</db:para>
         </choice>
       </attribute>
     </define>
-    <define name="k.vmwareconfig.HWversion.attribute">
+    <define name="k.machine.HWversion.attribute">
       <attribute name="HWversion">
-        <a:documentation>The virtual HW version number for the VMware configuration</a:documentation>
+        <a:documentation>The virtual HW version number for the VM configuration</a:documentation>
         <data type="integer"/>
       </attribute>
     </define>
-    <define name="k.vmwareconfig.guestOS.attribute">
+    <define name="k.machine.guestOS.attribute">
       <attribute name="guestOS">
-        <a:documentation>the virtual guestOS identification string for VMware</a:documentation>
+        <a:documentation>the virtual guestOS identification string for the VM</a:documentation>
       </attribute>
     </define>
-    <define name="k.vmwareconfig.memory.attribute">
+    <define name="k.machine.memory.attribute">
       <attribute name="memory">
         <a:documentation>The memory setup for the guest VM.</a:documentation>
       </attribute>
     </define>
-    <define name="k.vmwareconfig.usb.attribute">
-      <attribute name="usb">
-        <a:documentation>Activate/Deactivate usb controller for VMware</a:documentation>
-        <data type="boolean"/>
+    <define name="k.machine.domain.attribute">
+      <attribute name="domain">
+        <a:documentation>The domain setup for the VM (xen only)</a:documentation>
+        <choice>
+          <value>dom0</value>
+          <value>domU</value>
+        </choice>
       </attribute>
     </define>
-    <define name="k.vmwareconfig.attlist">
+    <define name="k.machine.attlist">
       <interleave>
         <optional>
-          <ref name="k.vmwareconfig.arch.attribute"/>
+          <ref name="k.machine.arch.attribute"/>
         </optional>
         <optional>
-          <ref name="k.vmwareconfig.HWversion.attribute"/>
+          <ref name="k.machine.HWversion.attribute"/>
         </optional>
         <optional>
-          <ref name="k.vmwareconfig.guestOS.attribute"/>
+          <ref name="k.machine.guestOS.attribute"/>
         </optional>
         <optional>
-          <ref name="k.vmwareconfig.usb.attribute"/>
+          <ref name="k.machine.memory.attribute"/>
+        </optional>
+        <optional>
+          <ref name="k.machine.domain.attribute"/>
         </optional>
-        <ref name="k.vmwareconfig.memory.attribute"/>
       </interleave>
     </define>
-    <define name="k.vmwareconfig">
-      <element name="vmwareconfig">
-        <a:documentation>specifies the VMware configuration sections</a:documentation>
-        <db:para>The vmwareconfig element specifies the VMware guest
-configuration options which are used by the VMware
+    <define name="k.machine">
+      <element name="machine">
+        <a:documentation>specifies the VM configuration sections</a:documentation>
+        <db:para>The machine element specifies the VM guest
+configuration options which are used by the
 virtual machine when running the image.</db:para>
         <interleave>
-          <ref name="k.vmwareconfig.attlist"/>
-          <optional>
-            <ref name="k.vmwarenic"/>
-          </optional>
+          <ref name="k.machine.attlist"/>
           <optional>
-            <ref name="k.vmwaredisk"/>
+            <ref name="k.vmnic"/>
           </optional>
           <optional>
-            <ref name="k.vmwarecdrom"/>
+            <ref name="k.vmdisk"/>
           </optional>
-        </interleave>
-      </element>
-    </define>
-  </div>
-  <!--
-    ==========================================
-    main block: <xenconfig>
-    
-  -->
-  <div>
-    <define name="k.xenconfig.memory.attribute">
-      <attribute name="memory">
-        <a:documentation>The memory setup for the Xen guest.</a:documentation>
-      </attribute>
-    </define>
-    <define name="k.xenconfig.domain.attribute">
-      <attribute name="domain">
-        <a:documentation>The type of Xen domain to create (dom0 or domU)</a:documentation>
-        <choice>
-          <value>dom0</value>
-          <value>domU</value>
-        </choice>
-      </attribute>
-    </define>
-    <define name="k.xenconfig.attlist">
-      <interleave>
-        <optional>
-          <ref name="k.xenconfig.memory.attribute"/>
-        </optional>
-        <optional>
-          <ref name="k.xenconfig.domain.attribute"/>
-        </optional>
-      </interleave>
-    </define>
-    <define name="k.xenconfig">
-      <element name="xenconfig">
-        <a:documentation>specifies the Xen configuration sections</a:documentation>
-        <db:para>The xenconfig element specifies the Xen guest
-configuration options which are used by the Xen
-para virtual machine when running the image.</db:para>
-        <interleave>
-          <ref name="k.xenconfig.attlist"/>
           <optional>
-            <ref name="k.xendisk"/>
+            <ref name="k.vmdvd"/>
           </optional>
-          <zeroOrMore>
-            <ref name="k.xenbridge"/>
-          </zeroOrMore>
         </interleave>
       </element>
     </define>
diff --git a/modules/KIWIXML.pm b/modules/KIWIXML.pm
index 099f55b..500c8f3 100644
--- a/modules/KIWIXML.pm
+++ b/modules/KIWIXML.pm
@@ -799,6 +799,8 @@ sub getImageTypeAndAttributes {
 		$record{flags}         = $node -> getAttribute("flags");
 		$record{hybrid}        = $node -> getAttribute("hybrid");
 		$record{format}        = $node -> getAttribute("format");
+		$record{installiso}    = $node -> getAttribute("installiso");
+		$record{installstick}  = $node -> getAttribute("installstick");
 		$record{vga}           = $node -> getAttribute("vga");
 		$record{bootloader}    = $node -> getAttribute("bootloader");
 		$record{checkprebuilt} = $node -> getAttribute("checkprebuilt");
@@ -2714,12 +2716,12 @@ sub getEc2Config {
 #------------------------------------------
 sub getVMwareConfig {
 	# ...
-	# Create an Attribute hash from the <vmwareconfig>
-	# section if it exists
+	# Create an Attribute hash from the <machine>
+	# section if it exists suitable for the VMware configuration
 	# ---
 	my $this = shift;
 	my $tnode= $this->{typeNode};
-	my $node = $tnode -> getElementsByTagName ("vmwareconfig") -> get_node(1);
+	my $node = $tnode -> getElementsByTagName ("machine") -> get_node(1);
 	my %result = ();
 	my %guestos= ();
 	if (! defined $node) {
@@ -2762,7 +2764,7 @@ sub getVMwareConfig {
 	#==========================================
 	# storage setup disk
 	#------------------------------------------
-	my $disk = $node -> getElementsByTagName ("vmwaredisk");
+	my $disk = $node -> getElementsByTagName ("vmdisk");
 	my ($type,$id);
 	if ($disk) {
 		my $node = $disk -> get_node(1);
@@ -2772,7 +2774,7 @@ sub getVMwareConfig {
 	#==========================================
 	# storage setup CD rom
 	#------------------------------------------
-	my $cd = $node -> getElementsByTagName ("vmwarecdrom");
+	my $cd = $node -> getElementsByTagName ("vmdvd");
 	my ($cdtype,$cdid);
 	if ($cd) {
 		my $node = $cd -> get_node(1);
@@ -2782,7 +2784,7 @@ sub getVMwareConfig {
 	#==========================================
 	# network setup
 	#------------------------------------------
-	my $nic  = $node -> getElementsByTagName ("vmwarenic");
+	my $nic  = $node -> getElementsByTagName ("vmnic");
 	my ($drv,$iface,$mode);
 	if ($nic) {
 		my $node = $nic  -> get_node(1);
@@ -2821,12 +2823,12 @@ sub getVMwareConfig {
 #------------------------------------------
 sub getXenConfig {
 	# ...
-	# Create an Attribute hash from the <xenconfig>
-	# section if it exists
+	# Create an Attribute hash from the <machine>
+	# section if it exists suitable for the xen domU configuration
 	# ---
 	my $this = shift;
 	my $tnode= $this->{typeNode};
-	my $node = $tnode -> getElementsByTagName ("xenconfig") -> get_node(1);
+	my $node = $tnode -> getElementsByTagName ("machine") -> get_node(1);
 	my %result = ();
 	if (! defined $node) {
 		return %result;
@@ -2839,7 +2841,7 @@ sub getXenConfig {
 	#==========================================
 	# storage setup
 	#------------------------------------------
-	my $disk = $node -> getElementsByTagName ("xendisk");
+	my $disk = $node -> getElementsByTagName ("vmdisk");
 	my ($device);
 	if ($disk) {
 		my $node  = $disk -> get_node(1);
@@ -2848,13 +2850,13 @@ sub getXenConfig {
 	#==========================================
 	# network setup (bridge)
 	#------------------------------------------
-	my $bridges = $node -> getElementsByTagName ("xenbridge");
+	my $bridges = $node -> getElementsByTagName ("vmnic");
 	my %vifs = ();
 	for (my $i=1;$i<= $bridges->size();$i++) {
 		my $bridge = $bridges -> get_node($i);
 		if ($bridge) {
 			my $mac   = $bridge -> getAttribute ("mac");
-			my $bname = $bridge -> getAttribute ("name");
+			my $bname = $bridge -> getAttribute ("interface");
 			if (! $bname) {
 				$bname = "undef";
 			}
diff --git a/rpm/kiwi.changes b/rpm/kiwi.changes
index dcee752..5a88910 100644
--- a/rpm/kiwi.changes
+++ b/rpm/kiwi.changes
@@ -1,6 +1,18 @@
 -------------------------------------------------------------------
 Mon Jun 28 10:28:17 CEST 2010 - ms at suse.de
 
+- Cleanup formats in kiwi:
+  * create new KIWIImageFormat.pm module for the conversion
+    into different image formats like vmdk,ovf and friends.
+    Also added function for creating the machine configuration
+    into this new module
+  * create common XML specification for vmware|xen config
+    starting with <machine>
+  * added new option --convert to kiwi.
+  * recursively call kiwi with $main::Convert set to convert
+    into the specified format and/or configuration
+  * added bool attributes installcd and installstick replacing
+    the old format="iso" and format="usb" setup
 - moved the XML validation ahead of the first data extraction
 - changed the way validation errors are reported. If the xml
   file was converted via XSL the error will be reported
diff --git a/system/boot/ix86/isoboot/rhel-05.4/config.xml b/system/boot/ix86/isoboot/rhel-05.4/config.xml
index e2290cc..2fdab40 100644
--- a/system/boot/ix86/isoboot/rhel-05.4/config.xml
+++ b/system/boot/ix86/isoboot/rhel-05.4/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-isoboot-rhel-05.4">
+<image schemaversion="4.7" name="initrd-isoboot-rhel-05.4">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/isoboot/suse-11.1/config.xml b/system/boot/ix86/isoboot/suse-11.1/config.xml
index 22783f8..c98516e 100644
--- a/system/boot/ix86/isoboot/suse-11.1/config.xml
+++ b/system/boot/ix86/isoboot/suse-11.1/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-isoboot-suse-11.1">
+<image schemaversion="4.7" name="initrd-isoboot-suse-11.1">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/isoboot/suse-11.2/config.xml b/system/boot/ix86/isoboot/suse-11.2/config.xml
index 9762bf6..ecf44d1 100644
--- a/system/boot/ix86/isoboot/suse-11.2/config.xml
+++ b/system/boot/ix86/isoboot/suse-11.2/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-isoboot-suse-11.2">
+<image schemaversion="4.7" name="initrd-isoboot-suse-11.2">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/isoboot/suse-11.3/config.xml b/system/boot/ix86/isoboot/suse-11.3/config.xml
index 5c166f7..e9fec6a 100644
--- a/system/boot/ix86/isoboot/suse-11.3/config.xml
+++ b/system/boot/ix86/isoboot/suse-11.3/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-isoboot-suse-11.3">
+<image schemaversion="4.7" name="initrd-isoboot-suse-11.3">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/isoboot/suse-SLED10/config.xml b/system/boot/ix86/isoboot/suse-SLED10/config.xml
index f610fd8..175b9e1 100644
--- a/system/boot/ix86/isoboot/suse-SLED10/config.xml
+++ b/system/boot/ix86/isoboot/suse-SLED10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-isoboot-suse-SLED10">
+<image schemaversion="4.7" name="initrd-isoboot-suse-SLED10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/isoboot/suse-SLED11/config.xml b/system/boot/ix86/isoboot/suse-SLED11/config.xml
index 9c52599..19e2a84 100644
--- a/system/boot/ix86/isoboot/suse-SLED11/config.xml
+++ b/system/boot/ix86/isoboot/suse-SLED11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-isoboot-suse-SLED11">
+<image schemaversion="4.7" name="initrd-isoboot-suse-SLED11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/isoboot/suse-SLES10/config.xml b/system/boot/ix86/isoboot/suse-SLES10/config.xml
index ff3823f..2397835 100644
--- a/system/boot/ix86/isoboot/suse-SLES10/config.xml
+++ b/system/boot/ix86/isoboot/suse-SLES10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-isoboot-suse-SLES10">
+<image schemaversion="4.7" name="initrd-isoboot-suse-SLES10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/isoboot/suse-SLES11/config.xml b/system/boot/ix86/isoboot/suse-SLES11/config.xml
index 6ea0d9a..630f26c 100644
--- a/system/boot/ix86/isoboot/suse-SLES11/config.xml
+++ b/system/boot/ix86/isoboot/suse-SLES11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-isoboot-suse-SLES11">
+<image schemaversion="4.7" name="initrd-isoboot-suse-SLES11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/netboot/suse-11.1/config.xml b/system/boot/ix86/netboot/suse-11.1/config.xml
index 8f859c7..4fe39ab 100644
--- a/system/boot/ix86/netboot/suse-11.1/config.xml
+++ b/system/boot/ix86/netboot/suse-11.1/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-netboot-suse-11.1">
+<image schemaversion="4.7" name="initrd-netboot-suse-11.1">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/netboot/suse-11.2/config.xml b/system/boot/ix86/netboot/suse-11.2/config.xml
index 7432546..f069ce2 100644
--- a/system/boot/ix86/netboot/suse-11.2/config.xml
+++ b/system/boot/ix86/netboot/suse-11.2/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-netboot-suse-11.2">
+<image schemaversion="4.7" name="initrd-netboot-suse-11.2">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/netboot/suse-11.3/config.xml b/system/boot/ix86/netboot/suse-11.3/config.xml
index 8f69db0..e2eca37 100644
--- a/system/boot/ix86/netboot/suse-11.3/config.xml
+++ b/system/boot/ix86/netboot/suse-11.3/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-netboot-suse-11.3">
+<image schemaversion="4.7" name="initrd-netboot-suse-11.3">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/netboot/suse-SLED10/config.xml b/system/boot/ix86/netboot/suse-SLED10/config.xml
index ddb37cf..fbbf0e1 100644
--- a/system/boot/ix86/netboot/suse-SLED10/config.xml
+++ b/system/boot/ix86/netboot/suse-SLED10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-netboot-suse-SLED10">
+<image schemaversion="4.7" name="initrd-netboot-suse-SLED10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/netboot/suse-SLED11/config.xml b/system/boot/ix86/netboot/suse-SLED11/config.xml
index da80b48..86745f6 100644
--- a/system/boot/ix86/netboot/suse-SLED11/config.xml
+++ b/system/boot/ix86/netboot/suse-SLED11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-netboot-suse-SLED11">
+<image schemaversion="4.7" name="initrd-netboot-suse-SLED11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/netboot/suse-SLES10/config.xml b/system/boot/ix86/netboot/suse-SLES10/config.xml
index 3d1af48..410ac43 100644
--- a/system/boot/ix86/netboot/suse-SLES10/config.xml
+++ b/system/boot/ix86/netboot/suse-SLES10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-netboot-suse-SLES10">
+<image schemaversion="4.7" name="initrd-netboot-suse-SLES10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/netboot/suse-SLES11/config.xml b/system/boot/ix86/netboot/suse-SLES11/config.xml
index 170edd3..12797cc 100644
--- a/system/boot/ix86/netboot/suse-SLES11/config.xml
+++ b/system/boot/ix86/netboot/suse-SLES11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-netboot-suse-SLES11">
+<image schemaversion="4.7" name="initrd-netboot-suse-SLES11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/oemboot/suse-11.1/config.xml b/system/boot/ix86/oemboot/suse-11.1/config.xml
index 5915510..6a31373 100644
--- a/system/boot/ix86/oemboot/suse-11.1/config.xml
+++ b/system/boot/ix86/oemboot/suse-11.1/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-oemboot-suse-11.1">
+<image schemaversion="4.7" name="initrd-oemboot-suse-11.1">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/oemboot/suse-11.2/config.xml b/system/boot/ix86/oemboot/suse-11.2/config.xml
index ae54aed..f05e326 100644
--- a/system/boot/ix86/oemboot/suse-11.2/config.xml
+++ b/system/boot/ix86/oemboot/suse-11.2/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-oemboot-suse-11.2">
+<image schemaversion="4.7" name="initrd-oemboot-suse-11.2">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/oemboot/suse-11.3/config.xml b/system/boot/ix86/oemboot/suse-11.3/config.xml
index aadbf52..04db990 100644
--- a/system/boot/ix86/oemboot/suse-11.3/config.xml
+++ b/system/boot/ix86/oemboot/suse-11.3/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-oemboot-suse-11.3">
+<image schemaversion="4.7" name="initrd-oemboot-suse-11.3">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/oemboot/suse-SLED10/config.xml b/system/boot/ix86/oemboot/suse-SLED10/config.xml
index 09db029..ef37b9a 100644
--- a/system/boot/ix86/oemboot/suse-SLED10/config.xml
+++ b/system/boot/ix86/oemboot/suse-SLED10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-oemboot-suse-SLED10">
+<image schemaversion="4.7" name="initrd-oemboot-suse-SLED10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/oemboot/suse-SLED11/config.xml b/system/boot/ix86/oemboot/suse-SLED11/config.xml
index ac5f54d..5063bb0 100644
--- a/system/boot/ix86/oemboot/suse-SLED11/config.xml
+++ b/system/boot/ix86/oemboot/suse-SLED11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-oemboot-suse-SLED11">
+<image schemaversion="4.7" name="initrd-oemboot-suse-SLED11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/oemboot/suse-SLES10/config.xml b/system/boot/ix86/oemboot/suse-SLES10/config.xml
index 881d89f..f92a9a5 100644
--- a/system/boot/ix86/oemboot/suse-SLES10/config.xml
+++ b/system/boot/ix86/oemboot/suse-SLES10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-oemboot-suse-SLES10">
+<image schemaversion="4.7" name="initrd-oemboot-suse-SLES10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/oemboot/suse-SLES11/config.xml b/system/boot/ix86/oemboot/suse-SLES11/config.xml
index 6ac3ff6..04cbdeb 100644
--- a/system/boot/ix86/oemboot/suse-SLES11/config.xml
+++ b/system/boot/ix86/oemboot/suse-SLES11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-oemboot-suse-SLES11">
+<image schemaversion="4.7" name="initrd-oemboot-suse-SLES11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/usbboot/suse-11.1/config.xml b/system/boot/ix86/usbboot/suse-11.1/config.xml
index cde7bcd..99ae2f4 100644
--- a/system/boot/ix86/usbboot/suse-11.1/config.xml
+++ b/system/boot/ix86/usbboot/suse-11.1/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-usbboot-suse-11.1">
+<image schemaversion="4.7" name="initrd-usbboot-suse-11.1">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/usbboot/suse-11.2/config.xml b/system/boot/ix86/usbboot/suse-11.2/config.xml
index eb8a9d9..702bddd 100644
--- a/system/boot/ix86/usbboot/suse-11.2/config.xml
+++ b/system/boot/ix86/usbboot/suse-11.2/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-usbboot-suse-11.2">
+<image schemaversion="4.7" name="initrd-usbboot-suse-11.2">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/usbboot/suse-11.3/config.xml b/system/boot/ix86/usbboot/suse-11.3/config.xml
index 9caa115..9a1d700 100644
--- a/system/boot/ix86/usbboot/suse-11.3/config.xml
+++ b/system/boot/ix86/usbboot/suse-11.3/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-usbboot-suse-11.3">
+<image schemaversion="4.7" name="initrd-usbboot-suse-11.3">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/usbboot/suse-SLED10/config.xml b/system/boot/ix86/usbboot/suse-SLED10/config.xml
index 96e087a..0502b2b 100644
--- a/system/boot/ix86/usbboot/suse-SLED10/config.xml
+++ b/system/boot/ix86/usbboot/suse-SLED10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-usbboot-suse-SLED10">
+<image schemaversion="4.7" name="initrd-usbboot-suse-SLED10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/usbboot/suse-SLED11/config.xml b/system/boot/ix86/usbboot/suse-SLED11/config.xml
index 021ebd4..4f1e10b 100644
--- a/system/boot/ix86/usbboot/suse-SLED11/config.xml
+++ b/system/boot/ix86/usbboot/suse-SLED11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-usbboot-suse-SLED11">
+<image schemaversion="4.7" name="initrd-usbboot-suse-SLED11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/usbboot/suse-SLES10/config.xml b/system/boot/ix86/usbboot/suse-SLES10/config.xml
index 7a0ca4f..7570ca4 100644
--- a/system/boot/ix86/usbboot/suse-SLES10/config.xml
+++ b/system/boot/ix86/usbboot/suse-SLES10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-usbboot-suse-SLES10">
+<image schemaversion="4.7" name="initrd-usbboot-suse-SLES10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/usbboot/suse-SLES11/config.xml b/system/boot/ix86/usbboot/suse-SLES11/config.xml
index 6472088..e6ddd91 100644
--- a/system/boot/ix86/usbboot/suse-SLES11/config.xml
+++ b/system/boot/ix86/usbboot/suse-SLES11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-usbboot-suse-SLES11">
+<image schemaversion="4.7" name="initrd-usbboot-suse-SLES11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/vmxboot/suse-11.1/config.xml b/system/boot/ix86/vmxboot/suse-11.1/config.xml
index 0feed00..beade10 100644
--- a/system/boot/ix86/vmxboot/suse-11.1/config.xml
+++ b/system/boot/ix86/vmxboot/suse-11.1/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-vmxboot-suse-11.1">
+<image schemaversion="4.7" name="initrd-vmxboot-suse-11.1">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/vmxboot/suse-11.2/config.xml b/system/boot/ix86/vmxboot/suse-11.2/config.xml
index 54f7dee..63ef892 100644
--- a/system/boot/ix86/vmxboot/suse-11.2/config.xml
+++ b/system/boot/ix86/vmxboot/suse-11.2/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-vmxboot-suse-11.2">
+<image schemaversion="4.7" name="initrd-vmxboot-suse-11.2">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/vmxboot/suse-11.3/config.xml b/system/boot/ix86/vmxboot/suse-11.3/config.xml
index 5472ed4..ba228b5 100644
--- a/system/boot/ix86/vmxboot/suse-11.3/config.xml
+++ b/system/boot/ix86/vmxboot/suse-11.3/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-vmxboot-suse-11.3">
+<image schemaversion="4.7" name="initrd-vmxboot-suse-11.3">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/vmxboot/suse-SLED10/config.xml b/system/boot/ix86/vmxboot/suse-SLED10/config.xml
index d18100c..dbc6a9e 100644
--- a/system/boot/ix86/vmxboot/suse-SLED10/config.xml
+++ b/system/boot/ix86/vmxboot/suse-SLED10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-vmxboot-suse-SLED10">
+<image schemaversion="4.7" name="initrd-vmxboot-suse-SLED10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/vmxboot/suse-SLED11/config.xml b/system/boot/ix86/vmxboot/suse-SLED11/config.xml
index bbe886f..a8e8dc8 100644
--- a/system/boot/ix86/vmxboot/suse-SLED11/config.xml
+++ b/system/boot/ix86/vmxboot/suse-SLED11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-vmxboot-suse-SLED11">
+<image schemaversion="4.7" name="initrd-vmxboot-suse-SLED11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/vmxboot/suse-SLES10/config.xml b/system/boot/ix86/vmxboot/suse-SLES10/config.xml
index d9d3ff2..2842409 100644
--- a/system/boot/ix86/vmxboot/suse-SLES10/config.xml
+++ b/system/boot/ix86/vmxboot/suse-SLES10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-vmxboot-suse-SLES10">
+<image schemaversion="4.7" name="initrd-vmxboot-suse-SLES10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/vmxboot/suse-SLES11/config.xml b/system/boot/ix86/vmxboot/suse-SLES11/config.xml
index 24c10ee..8d40d4a 100644
--- a/system/boot/ix86/vmxboot/suse-SLES11/config.xml
+++ b/system/boot/ix86/vmxboot/suse-SLES11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-vmxboot-suse-SLES11">
+<image schemaversion="4.7" name="initrd-vmxboot-suse-SLES11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/xenboot/suse-11.1/config.xml b/system/boot/ix86/xenboot/suse-11.1/config.xml
index 6f141db..e3bae61 100644
--- a/system/boot/ix86/xenboot/suse-11.1/config.xml
+++ b/system/boot/ix86/xenboot/suse-11.1/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-xenboot-suse-11.1">
+<image schemaversion="4.7" name="initrd-xenboot-suse-11.1">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/xenboot/suse-11.2/config.xml b/system/boot/ix86/xenboot/suse-11.2/config.xml
index da034eb..80c0f63 100644
--- a/system/boot/ix86/xenboot/suse-11.2/config.xml
+++ b/system/boot/ix86/xenboot/suse-11.2/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-xenboot-suse-11.2">
+<image schemaversion="4.7" name="initrd-xenboot-suse-11.2">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/xenboot/suse-11.3/config.xml b/system/boot/ix86/xenboot/suse-11.3/config.xml
index 0f6bfe4..e6e42fd 100644
--- a/system/boot/ix86/xenboot/suse-11.3/config.xml
+++ b/system/boot/ix86/xenboot/suse-11.3/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-xenboot-suse-11.3">
+<image schemaversion="4.7" name="initrd-xenboot-suse-11.3">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/xenboot/suse-SLED10/config.xml b/system/boot/ix86/xenboot/suse-SLED10/config.xml
index b73b9f9..397e95c 100644
--- a/system/boot/ix86/xenboot/suse-SLED10/config.xml
+++ b/system/boot/ix86/xenboot/suse-SLED10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-xenboot-suse-SLED10">
+<image schemaversion="4.7" name="initrd-xenboot-suse-SLED10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/xenboot/suse-SLED11/config.xml b/system/boot/ix86/xenboot/suse-SLED11/config.xml
index c7fd633..1383213 100644
--- a/system/boot/ix86/xenboot/suse-SLED11/config.xml
+++ b/system/boot/ix86/xenboot/suse-SLED11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-xenboot-suse-SLED11">
+<image schemaversion="4.7" name="initrd-xenboot-suse-SLED11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/xenboot/suse-SLES10/config.xml b/system/boot/ix86/xenboot/suse-SLES10/config.xml
index 31388eb..d6a59c2 100644
--- a/system/boot/ix86/xenboot/suse-SLES10/config.xml
+++ b/system/boot/ix86/xenboot/suse-SLES10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-xenboot-suse-SLES10">
+<image schemaversion="4.7" name="initrd-xenboot-suse-SLES10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ix86/xenboot/suse-SLES11/config.xml b/system/boot/ix86/xenboot/suse-SLES11/config.xml
index afe75f0..749ab6a 100644
--- a/system/boot/ix86/xenboot/suse-SLES11/config.xml
+++ b/system/boot/ix86/xenboot/suse-SLES11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-xenboot-suse-SLES11">
+<image schemaversion="4.7" name="initrd-xenboot-suse-SLES11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ppc/netboot/suse-11.1/config.xml b/system/boot/ppc/netboot/suse-11.1/config.xml
index 77e174f..09ffb51 100644
--- a/system/boot/ppc/netboot/suse-11.1/config.xml
+++ b/system/boot/ppc/netboot/suse-11.1/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-netboot-suse-11.1">
+<image schemaversion="4.7" name="initrd-netboot-suse-11.1">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ppc/netboot/suse-11.2/config.xml b/system/boot/ppc/netboot/suse-11.2/config.xml
index 0a29c3c..87bc21a 100644
--- a/system/boot/ppc/netboot/suse-11.2/config.xml
+++ b/system/boot/ppc/netboot/suse-11.2/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-netboot-suse-11.2">
+<image schemaversion="4.7" name="initrd-netboot-suse-11.2">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/ppc/netboot/suse-11.3/config.xml b/system/boot/ppc/netboot/suse-11.3/config.xml
index 3d1b9f6..3ddd36d 100644
--- a/system/boot/ppc/netboot/suse-11.3/config.xml
+++ b/system/boot/ppc/netboot/suse-11.3/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-netboot-suse-11.3">
+<image schemaversion="4.7" name="initrd-netboot-suse-11.3">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/s390/oemboot/suse-SLES10/config.xml b/system/boot/s390/oemboot/suse-SLES10/config.xml
index b58217d..ac4265b 100644
--- a/system/boot/s390/oemboot/suse-SLES10/config.xml
+++ b/system/boot/s390/oemboot/suse-SLES10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-oemboot-suse-SLES10">
+<image schemaversion="4.7" name="initrd-oemboot-suse-SLES10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/s390/oemboot/suse-SLES11/config.xml b/system/boot/s390/oemboot/suse-SLES11/config.xml
index 7f5f74e..24e4fdb 100644
--- a/system/boot/s390/oemboot/suse-SLES11/config.xml
+++ b/system/boot/s390/oemboot/suse-SLES11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-oemboot-suse-SLES11">
+<image schemaversion="4.7" name="initrd-oemboot-suse-SLES11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/s390/vmxboot/suse-SLES10/config.xml b/system/boot/s390/vmxboot/suse-SLES10/config.xml
index f1f4527..f5d638e 100644
--- a/system/boot/s390/vmxboot/suse-SLES10/config.xml
+++ b/system/boot/s390/vmxboot/suse-SLES10/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-vmxboot-suse-SLES10">
+<image schemaversion="4.7" name="initrd-vmxboot-suse-SLES10">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/system/boot/s390/vmxboot/suse-SLES11/config.xml b/system/boot/s390/vmxboot/suse-SLES11/config.xml
index a742c76..938e928 100644
--- a/system/boot/s390/vmxboot/suse-SLES11/config.xml
+++ b/system/boot/s390/vmxboot/suse-SLES11/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="initrd-vmxboot-suse-SLES11">
+<image schemaversion="4.7" name="initrd-vmxboot-suse-SLES11">
 	<description type="boot">
 		<author>Marcus Schaefer</author>
 		<contact>ms at novell.com</contact>
diff --git a/template/rhel-05.4-JeOS/config.xml b/template/rhel-05.4-JeOS/config.xml
index 74bdd5a..0783963 100644
--- a/template/rhel-05.4-JeOS/config.xml
+++ b/template/rhel-05.4-JeOS/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="LimeJeOS-RHEL-05.4">
+<image schemaversion="4.7" name="LimeJeOS-RHEL-05.4">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
diff --git a/template/suse-11.1-JeOS/config.xml b/template/suse-11.1-JeOS/config.xml
index 685349d..8694a9b 100644
--- a/template/suse-11.1-JeOS/config.xml
+++ b/template/suse-11.1-JeOS/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="LimeJeOS-openSUSE-11.1">
+<image schemaversion="4.7" name="LimeJeOS-openSUSE-11.1">
 	<description type="system">
 		<author>Christoph Thiel</author>
 		<contact>cthiel at novell.com</contact>
@@ -21,35 +21,35 @@
 	</preferences>
 	<preferences profiles="xenFlavour">
 		<type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.1" bootprofile="xen" bootkernel="xenk">
-			<xenconfig memory="512" domain="domU">
-				<xendisk device="/dev/xvda"/>
-				<xenbridge name=""/>
-			</xenconfig>
+			<machine memory="512" domain="domU">
+				<vmdisk controller="ide" id="0" device="/dev/xvda"/>
+				<vmnic interface=""/>
+			</machine>
 		</type>
-		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.1" bootprofile="xen" bootkernel="xenk" format="iso">
+		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.1" bootprofile="xen" bootkernel="xenk" installiso="true">
 			<oemconfig>
 				<oem-home>false</oem-home>
 				<oem-systemsize>2048</oem-systemsize>
 			</oemconfig>
-			<xenconfig domain="dom0"/>
+			<machine domain="dom0"/>
 		</type>
 	</preferences>
 	<preferences profiles="vmxFlavour">
 		<type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.1" format="vmdk">
-			<vmwareconfig memory="512" guestOS="suse" HWversion="4">
-				<vmwaredisk controller="scsi" id="0"/>
-				<vmwarenic driver="e1000" interface="0" mode="bridged"/>
-			</vmwareconfig>
+			<machine memory="512" guestOS="suse" HWversion="4">
+				<vmdisk controller="scsi" id="0"/>
+				<vmnic driver="e1000" interface="0" mode="bridged"/>
+			</machine>
 		</type>
-		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.1" format="iso">
+		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.1" installiso="true">
 			<oemconfig>
 				<oem-home>false</oem-home>
 				<oem-systemsize>2048</oem-systemsize>
 			</oemconfig>
-			<vmwareconfig memory="512" guestOS="suse" HWversion="4">
-				<vmwaredisk controller="scsi" id="0"/>
-				<vmwarenic driver="e1000" interface="0" mode="bridged"/>
-			</vmwareconfig>
+			<machine memory="512" guestOS="suse" HWversion="4">
+				<vmdisk controller="scsi" id="0"/>
+				<vmnic driver="e1000" interface="0" mode="bridged"/>
+			</machine>
 		</type>
 	</preferences>
 	<users group="root">
diff --git a/template/suse-11.2-JeOS/config.xml b/template/suse-11.2-JeOS/config.xml
index 19f6e6b..48a5fe1 100644
--- a/template/suse-11.2-JeOS/config.xml
+++ b/template/suse-11.2-JeOS/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="LimeJeOS-openSUSE-11.2">
+<image schemaversion="4.7" name="LimeJeOS-openSUSE-11.2">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
@@ -26,35 +26,35 @@
 	</preferences>
 	<preferences profiles="xenFlavour">
 		<type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.2" bootprofile="xen" bootkernel="xenk">
-			<xenconfig memory="512" domain="domU">
-				<xendisk device="/dev/xvda"/>
-				<xenbridge name=""/>
-			</xenconfig>
+			<machine memory="512" domain="domU">
+				<vmdisk controller="ide" id="0" device="/dev/xvda"/>
+				<vmnic interface=""/>
+			</machine>
 		</type>
-		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.2" bootprofile="xen" bootkernel="xenk" format="iso">
+		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.2" bootprofile="xen" bootkernel="xenk" installiso="true">
 			<oemconfig>
 				<oem-home>false</oem-home>
 				<oem-systemsize>2048</oem-systemsize>
 			</oemconfig>
-			<xenconfig domain="dom0"/>
+			<machine domain="dom0"/>
 		</type>
 	</preferences>
 	<preferences profiles="vmxFlavour">
 		<type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.2" format="vmdk">
-			<vmwareconfig memory="512" guestOS="suse" HWversion="4">
-				<vmwaredisk controller="scsi" id="0"/>
-				<vmwarenic driver="e1000" interface="0" mode="bridged"/>
-			</vmwareconfig>
+			<machine memory="512" guestOS="suse" HWversion="4">
+				<vmdisk controller="scsi" id="0"/>
+				<vmnic driver="e1000" interface="0" mode="bridged"/>
+			</machine>
 		</type>
-		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.2" format="iso">
+		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.2" installiso="true">
 			<oemconfig>
 				<oem-home>false</oem-home>
 				<oem-systemsize>2048</oem-systemsize>
 			</oemconfig>
-			<vmwareconfig memory="512" guestOS="suse" HWversion="4">
-				<vmwaredisk controller="scsi" id="0"/>
-				<vmwarenic driver="e1000" interface="0" mode="bridged"/>
-			</vmwareconfig>
+			<machine memory="512" guestOS="suse" HWversion="4">
+				<vmdisk controller="scsi" id="0"/>
+				<vmnic driver="e1000" interface="0" mode="bridged"/>
+			</machine>
 		</type>
 	</preferences>
 	<users group="root">
diff --git a/template/suse-11.3-JeOS/config.xml b/template/suse-11.3-JeOS/config.xml
index 9102ab4..e7f5eaa 100644
--- a/template/suse-11.3-JeOS/config.xml
+++ b/template/suse-11.3-JeOS/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="LimeJeOS-openSUSE-11.3">
+<image schemaversion="4.7" name="LimeJeOS-openSUSE-11.3">
 	<description type="system">
 		<author>Marcus Schäfer</author>
 		<contact>ms at novell.com</contact>
@@ -26,35 +26,35 @@
 	</preferences>
 	<preferences profiles="xenFlavour">
 		<type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" bootprofile="xen" bootkernel="xenk">
-			<xenconfig memory="512" domain="domU">
-				<xendisk device="/dev/xvda"/>
-				<xenbridge name=""/>
-			</xenconfig>
+			<machine memory="512" domain="domU">
+				<vmdisk controller="ide" id="0" device="/dev/xvda"/>
+				<vmnic interface=""/>
+			</machine>
 		</type>
-		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.3" bootprofile="xen" bootkernel="xenk" format="iso">
+		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.3" bootprofile="xen" bootkernel="xenk" installiso="true">
 			<oemconfig>
 				<oem-home>false</oem-home>
 				<oem-systemsize>2048</oem-systemsize>
 			</oemconfig>
-			<xenconfig domain="dom0"/>
+			<machine domain="dom0"/>
 		</type>
 	</preferences>
 	<preferences profiles="vmxFlavour">
 		<type image="vmx" filesystem="ext3" boot="vmxboot/suse-11.3" format="vmdk">
-			<vmwareconfig memory="512" guestOS="suse" HWversion="4">
-				<vmwaredisk controller="scsi" id="0"/>
-				<vmwarenic driver="e1000" interface="0" mode="bridged"/>
-			</vmwareconfig>
+			<machine memory="512" guestOS="suse" HWversion="4">
+				<vmdisk controller="scsi" id="0"/>
+				<vmnic driver="e1000" interface="0" mode="bridged"/>
+			</machine>
 		</type>
-		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.3" format="iso">
+		<type image="oem" filesystem="ext3" boot="oemboot/suse-11.3" installiso="true">
 			<oemconfig>
 				<oem-home>false</oem-home>
 				<oem-systemsize>2048</oem-systemsize>
 			</oemconfig>
-			<vmwareconfig memory="512" guestOS="suse" HWversion="4">
-				<vmwaredisk controller="scsi" id="0"/>
-				<vmwarenic driver="e1000" interface="0" mode="bridged"/>
-			</vmwareconfig>
+			<machine memory="512" guestOS="suse" HWversion="4">
+				<vmdisk controller="scsi" id="0"/>
+				<vmnic driver="e1000" interface="0" mode="bridged"/>
+			</machine>
 		</type>
 	</preferences>
 	<users group="root">
diff --git a/template/suse-SLE10-JeOS/config.xml b/template/suse-SLE10-JeOS/config.xml
index 360442e..8295ab0 100644
--- a/template/suse-SLE10-JeOS/config.xml
+++ b/template/suse-SLE10-JeOS/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="LimeJeOS-SLE10">
+<image schemaversion="4.7" name="LimeJeOS-SLE10">
 	<description type="system">
 		<author>Christoph Thiel</author>
 		<contact>cthiel at novell.com</contact>
@@ -22,35 +22,35 @@
 	</preferences>
 	<preferences profiles="xenFlavour">
 		<type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES10" bootprofile="xen" bootkernel="xenk">
-			<xenconfig memory="512" domain="domU">
-				<xendisk device="/dev/xvda"/>
-				<xenbridge name=""/>
-			</xenconfig>
+			<machine memory="512" domain="domU">
+				<vmdisk controller="ide" id="0" device="/dev/xvda"/>
+				<vmnic interface=""/>
+			</machine>
 		</type>
-		<type image="oem" filesystem="ext3" boot="oemboot/suse-SLES10" bootprofile="xen" bootkernel="xenk" format="iso">
+		<type image="oem" filesystem="ext3" boot="oemboot/suse-SLES10" bootprofile="xen" bootkernel="xenk" installiso="true">
 			<oemconfig>
 				<oem-home>false</oem-home>
 				<oem-systemsize>2048</oem-systemsize>
 			</oemconfig>
-			<xenconfig domain="dom0"/>
+			<machine domain="dom0"/>
 		</type>
 	</preferences>
 	<preferences profiles="vmxFlavour">
 		<type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES10" format="vmdk">
-			<vmwareconfig memory="512" guestOS="suse" HWversion="4">
-				<vmwaredisk controller="scsi" id="0"/>
-				<vmwarenic driver="e1000" interface="0" mode="bridged"/>
-			</vmwareconfig>
+			<machine memory="512" guestOS="suse" HWversion="4">
+				<vmdisk controller="scsi" id="0"/>
+				<vmnic driver="e1000" interface="0" mode="bridged"/>
+			</machine>
 		</type>
-		<type image="oem" filesystem="ext3" boot="oemboot/suse-SLES10" format="iso">
+		<type image="oem" filesystem="ext3" boot="oemboot/suse-SLES10" installiso="true">
 			<oemconfig>
 				<oem-home>false</oem-home>
 				<oem-systemsize>2048</oem-systemsize>
 			</oemconfig>
-			<vmwareconfig memory="512" guestOS="suse" HWversion="4">
-				<vmwaredisk controller="scsi" id="0"/>
-				<vmwarenic driver="e1000" interface="0" mode="bridged"/>
-			</vmwareconfig>
+			<machine memory="512" guestOS="suse" HWversion="4">
+				<vmdisk controller="scsi" id="0"/>
+				<vmnic driver="e1000" interface="0" mode="bridged"/>
+			</machine>
 		</type>
 	</preferences>
 	<users group="root">
diff --git a/template/suse-SLE11-JeOS/config.xml b/template/suse-SLE11-JeOS/config.xml
index c2ea62c..3fe1c5b 100644
--- a/template/suse-SLE11-JeOS/config.xml
+++ b/template/suse-SLE11-JeOS/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<image schemaversion="4.6" name="LimeJeOS-SLE11">
+<image schemaversion="4.7" name="LimeJeOS-SLE11">
 	<description type="system">
 		<author>Christoph Thiel</author>
 		<contact>cthiel at novell.com</contact>
@@ -23,35 +23,35 @@
 	</preferences>
 	<preferences profiles="xenFlavour">
 		<type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES11" bootprofile="xen" bootkernel="xenk">
-			<xenconfig memory="512" domain="domU">
-				<xendisk device="/dev/xvda"/>
-				<xenbridge name=""/>
-			</xenconfig>
+			<machine memory="512" domain="domU">
+				<vmdisk controller="ide" id="0" device="/dev/xvda"/>
+				<vmnic interface=""/>
+			</machine>
 		</type>
-		<type image="oem" filesystem="ext3" boot="oemboot/suse-SLES11" bootprofile="xen" bootkernel="xenk" format="iso">
+		<type image="oem" filesystem="ext3" boot="oemboot/suse-SLES11" bootprofile="xen" bootkernel="xenk" installiso="true">
 			<oemconfig>
 				<oem-home>false</oem-home>
 				<oem-systemsize>2048</oem-systemsize>
 			</oemconfig>
-			<xenconfig domain="dom0"/>
+			<machine domain="dom0"/>
 		</type>
 	</preferences>
 	<preferences profiles="vmxFlavour">
 		<type image="vmx" filesystem="ext3" boot="vmxboot/suse-SLES11" format="vmdk">
-			<vmwareconfig memory="512" guestOS="suse" HWversion="4">
-				<vmwaredisk controller="scsi" id="0"/>
-				<vmwarenic driver="e1000" interface="0" mode="bridged"/>
-			</vmwareconfig>
+			<machine memory="512" guestOS="suse" HWversion="4">
+				<vmdisk controller="scsi" id="0"/>
+				<vmnic driver="e1000" interface="0" mode="bridged"/>
+			</machine>
 		</type>
-		<type image="oem" filesystem="ext3" boot="oemboot/suse-SLES11" format="iso">
+		<type image="oem" filesystem="ext3" boot="oemboot/suse-SLES11" installiso="true">
 			<oemconfig>
 				<oem-home>false</oem-home>
 				<oem-systemsize>2048</oem-systemsize>
 			</oemconfig>
-			<vmwareconfig memory="512" guestOS="suse" HWversion="4">
-				<vmwaredisk controller="scsi" id="0"/>
-				<vmwarenic driver="e1000" interface="0" mode="bridged"/>
-			</vmwareconfig>
+			<machine memory="512" guestOS="suse" HWversion="4">
+				<vmdisk controller="scsi" id="0"/>
+				<vmnic driver="e1000" interface="0" mode="bridged"/>
+			</machine>
 		</type>
 	</preferences>
 	<users group="root">
diff --git a/xsl/convert46to47.xsl b/xsl/convert46to47.xsl
new file mode 100644
index 0000000..508243b
--- /dev/null
+++ b/xsl/convert46to47.xsl
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="xml"
+	indent="yes" omit-xml-declaration="no" encoding="utf-8"/>
+<xsl:strip-space elements="type"/>
+
+<!-- default rule -->
+<xsl:template match="*|processing-instruction()|comment()" mode="conv46to47">
+	<xsl:copy>
+		<xsl:copy-of select="@*"/>
+		<xsl:apply-templates mode="conv46to47"/>
+	</xsl:copy>  
+</xsl:template>
+
+<!-- update schema version -->
+<para xmlns="http://docbook.org/ns/docbook">
+	Changed attribute <tag class="attribute">schemaversion</tag>
+	to <tag class="attribute">schemaversion</tag> from
+	<literal>4.6</literal> to <literal>4.7</literal>.
+</para>
+<xsl:template match="image" mode="conv46to47">
+	<image schemaversion="4.7">
+		<xsl:copy-of select="@*[local-name() != 'schemaversion']"/>
+		<xsl:apply-templates mode="conv46to47"/>
+	</image>
+</xsl:template>
+
+<!-- turn vmwareconfig into machine -->
+<xsl:template match="vmwareconfig" mode="conv46to47">
+	<machine>
+		<xsl:copy-of select="@*"/>
+		<xsl:apply-templates mode="conv46to47"/>
+	</machine>
+</xsl:template>
+
+<!-- turn xenconfig into machine -->
+<xsl:template match="xenconfig" mode="conv46to47">
+	<machine>
+		<xsl:copy-of select="@*"/>
+		<xsl:apply-templates mode="conv46to47"/>
+	</machine>
+</xsl:template>
+
+<!-- turn vmwaredisk into vmdisk -->
+<xsl:template match="vmwareconfig/vmwaredisk" mode="conv46to47">
+	<vmdisk>
+		<xsl:copy-of select="@*"/>
+		<xsl:apply-templates mode="conv46to47"/>
+	</vmdisk>
+</xsl:template>
+
+<!-- turn vmwarenic into vmnic -->
+<xsl:template match="vmwareconfig/vmwarenic" mode="conv46to47">
+	<vmnic>
+		<xsl:copy-of select="@*"/>
+		<xsl:apply-templates mode="conv46to47"/>
+	</vmnic>
+</xsl:template>
+
+<!-- turn vmwarecdrom into vmdvd -->
+<xsl:template match="vmwareconfig/vmwarecdrom" mode="conv46to47">
+	<vmdvd>
+		<xsl:copy-of select="@*"/>
+		<xsl:apply-templates mode="conv46to47"/>
+	</vmdvd>
+</xsl:template>
+
+<!-- turn xenbridge into vmnic -->
+<xsl:template match="xenconfig/xenbridge" mode="conv46to47">
+	<xsl:variable name="iface" select="@name"/>
+	<vmnic>
+		<xsl:attribute name="interface">
+			<xsl:value-of select="$iface"/>
+		</xsl:attribute>
+		<xsl:copy-of select="@mac"/>
+		<xsl:apply-templates mode="conv46to47"/>
+	</vmnic>
+</xsl:template>
+
+<!-- turn xendisk into vmdisk -->
+<xsl:template match="xenconfig/xendisk" mode="conv46to47">
+	<vmdisk>
+		<xsl:attribute name="controller">
+			<xsl:text>ide</xsl:text>
+		</xsl:attribute>
+		<xsl:attribute name="id">
+			<xsl:text>0</xsl:text>
+		</xsl:attribute>
+		<xsl:copy-of select="@*"/>
+		<xsl:apply-templates mode="conv46to47"/>
+	</vmdisk>
+</xsl:template>
+
+<!-- turn format="iso" into installiso and format="usb" into installstick -->
+<xsl:template match="type" mode="conv46to47">
+	<type>
+		<xsl:copy-of select="@*[not(local-name(.) = 'format')]"/>
+		<xsl:choose>
+			<xsl:when test="@format='iso'">
+				<xsl:attribute name="installiso">
+					<xsl:text>true</xsl:text>
+				</xsl:attribute>
+			</xsl:when>
+			<xsl:when test="@format='usb'">
+				<xsl:attribute name="installstick">
+					<xsl:text>true</xsl:text>
+				</xsl:attribute>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:copy-of select="@format"/>
+			</xsl:otherwise>
+		</xsl:choose>
+		<xsl:apply-templates mode="conv46to47"/>
+	</type>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/xsl/master.xsl b/xsl/master.xsl
index 20bd937..a499e1d 100644
--- a/xsl/master.xsl
+++ b/xsl/master.xsl
@@ -17,6 +17,7 @@
 <xsl:import href="convert43to44.xsl"/>
 <xsl:import href="convert44to45.xsl"/>
 <xsl:import href="convert45to46.xsl"/>
+<xsl:import href="convert46to47.xsl"/>
 <xsl:import href="pretty.xsl"/>
 
 
@@ -71,9 +72,13 @@
 		<xsl:apply-templates select="exslt:node-set($v45)" mode="conv45to46"/>
 	</xsl:variable>
 
-    <xsl:apply-templates
-        select="exslt:node-set($v46)" mode="pretty"
-    />
+	<xsl:variable name="v47">
+		<xsl:apply-templates select="exslt:node-set($v46)" mode="conv46to47"/>
+	</xsl:variable>
+
+	<xsl:apply-templates
+		select="exslt:node-set($v47)" mode="pretty"
+	/>
 </xsl:template>
 
 </xsl:stylesheet>


hooks/post-receive
-- 
Project kiwi at BerliOS



More information about the Kiwi-devel mailing list